Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Help with the end #11

Open
wants to merge 120 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
fb8e221
Changes :D
Jan 23, 2016
6815d8d
grilled cheese
Jan 23, 2016
637acb7
Adding some stuff...
havk64 Jan 23, 2016
072e194
Actions require parentheses
chandler767 Jan 23, 2016
1672f98
Addds Curtain Down
krisbredemeier Jan 23, 2016
debffae
added list of holberton students for this batch
Jan 23, 2016
7ccd317
Merge pull request #1 from havk64/alexandro
krisbredemeier Jan 23, 2016
28689bb
added dramatic pause
chandler767 Jan 23, 2016
50b9091
added credits with list of students
Jan 23, 2016
faddced
Added my name :)
Jan 23, 2016
af4ecf2
Merge pull request #4 from dalzuga/credits
dalzuga Jan 23, 2016
42e9e02
Do you speak latin?
johnSerrano Jan 23, 2016
5894a28
Merge pull request #8 from johnSerrano/master
chandler767 Jan 23, 2016
7920a31
Merge pull request #6 from chandler767/chandler
johnSerrano Jan 23, 2016
6cc3f93
added more actions
chandler767 Jan 23, 2016
953fe13
grilled cheese
Jan 23, 2016
1b2e052
History channel
johnSerrano Jan 23, 2016
7e2a547
adds smily face
krisbredemeier Jan 23, 2016
a5d6ba9
Merge pull request #1 from chandler767/chandler
chandler767 Jan 23, 2016
138ea41
Update screenplay.txt
nbveroczi Jan 23, 2016
c9a7437
Merge pull request #2 from krisbredemeier/master
IanWagener Jan 23, 2016
7ad3a93
Add shouting message
Jan 23, 2016
a2256a2
adds change made by Bennett
bennettbuchanan Jan 23, 2016
2a0bf11
build an aquarium
johnSerrano Jan 23, 2016
fd8ac13
Cleaned up a little
Jan 23, 2016
ab824fb
Merge branch 'jdeepee-test_branch'
Jan 23, 2016
e61da0d
Add random message
Jan 23, 2016
e199acb
Merge pull request #10 from johnSerrano/master
chandler767 Jan 23, 2016
28d7506
Merge https://github.com/holbertonschoolstudents/discover-git
Jan 23, 2016
7230398
Update screenplay.txt
johnjohn987 Jan 23, 2016
94859ab
Changed enthusiastically to Exclaming
chandler767 Jan 23, 2016
f2b81a9
Simple changes
Jan 23, 2016
62e2572
Merge pull request #16 from jdeepee/master
jdeepee Jan 23, 2016
4a13a64
adds last name
bennettbuchanan Jan 23, 2016
316ea07
commit
chandler767 Jan 23, 2016
0c64df0
Merge pull request #11 from chandler767/master
johnSerrano Jan 23, 2016
a490a2d
Add test at end
Jan 23, 2016
775a169
created separate credits.txt file
Jan 23, 2016
51f4e43
Added second name
Jan 23, 2016
fc98e4c
grilled cheese
Jan 23, 2016
6a8b66d
grilled cheese
Jan 23, 2016
b351875
Merge pull request #5 from IanWagener/master
krisbredemeier Jan 23, 2016
3a22847
Merge pull request #19 from dalzuga/master
bennettbuchanan Jan 23, 2016
1864ec2
Added your second name
Jan 23, 2016
8f6b4f8
Merge pull request #21 from jdeepee/master
chandler767 Jan 23, 2016
e4472b7
Add a test at end
Jan 23, 2016
873535c
Merge pull request #17 from johnjohn987/John-Copy
johnjohn987 Jan 23, 2016
2446e46
Merge pull request #15 from holbertonschoolstudents/bennett_branch
dalzuga Jan 23, 2016
9d091e6
Merge pull request #23 from Praylin/my_branch
johnjohn987 Jan 23, 2016
5cb7889
Just added the zx6r text file
butcallmeJo Jan 23, 2016
fc8c3f7
First commit
nbveroczi Jan 23, 2016
8cbef17
added github accounts of people in the batch's github account
Jan 23, 2016
9aad2fa
Added line January 2016 batch
bilalbarki Jan 23, 2016
cdf2829
Merge pull request #29 from nbveroczi/master
afrancisboeuf Jan 23, 2016
a8dcaad
Merge pull request #27 from dalzuga/master
Praylin Jan 23, 2016
ce2096f
Merge pull request #28 from bilalbarki/my_feature
havk64 Jan 23, 2016
ce6a469
added some basic info about the zx6r motorcycle
butcallmeJo Jan 23, 2016
3cede48
Second commit
nbveroczi Jan 23, 2016
b908e8b
Made grammatical and style corrections
electrachong Jan 23, 2016
b9583e7
Merge branch 'master' into mason
krisbredemeier Jan 23, 2016
f74163b
Merge branch 'mason'
krisbredemeier Jan 23, 2016
31e400c
Merge branch 'master' of github.com:holbertonschoolstudents/discover-git
krisbredemeier Jan 23, 2016
42c5eff
Third commit
nbveroczi Jan 23, 2016
cec8e49
fixed a typo
Jan 23, 2016
e2a6ee0
Merge pull request #37 from electrachong/Electra-1
Praylin Jan 23, 2016
f1be4d4
fixed typo
Jan 23, 2016
05a40f6
removed a repetition
Jan 23, 2016
23025b5
Merge pull request #40 from frakentoaster/master
Jan 23, 2016
9c655cb
Revert "fixed typo"
Jan 23, 2016
7aeba48
removed a repetition
Jan 23, 2016
0c18978
An experimental git file
Jan 23, 2016
213f244
Merge branch 'jo-discover-git'
butcallmeJo Jan 23, 2016
1a83a8c
renamed file to descriptive name
Jan 23, 2016
a1421cf
Merge pull request #43 from dalzuga/renameFiles
dalzuga Jan 23, 2016
8ae85ae
Merge pull request #41 from holbertonschoolstudents/revert-40-master
Praylin Jan 23, 2016
d95b258
added a colon
Jan 23, 2016
de22e49
altered the scriprt format
SravanthiSinha Jan 23, 2016
0c1caf1
Merge pull request #44 from nbveroczi/nomibranch
afrancisboeuf Jan 23, 2016
555855c
pizza
Jan 23, 2016
79a60d9
Merge pull request #1 from dalzuga/renameFiles
dalzuga Jan 23, 2016
d0d7adb
Merge pull request #46 from dalzuga/master
afrancisboeuf Jan 23, 2016
478c63f
Amy knows latin
mason-fish Jan 23, 2016
3f8e7c9
added 'bright'
Jan 23, 2016
427feb2
info
Jan 23, 2016
ca932ec
Merge pull request #48 from WilliamMcCann/william_take_two
Praylin Jan 23, 2016
9fb8451
Merge pull request #47 from mason-fish/mason_branch
mason-fish Jan 23, 2016
0947bf5
Merge pull request #45 from SravanthiSinha/master
SravanthiSinha Jan 23, 2016
86b3f9e
Merge pull request #49 from butcallmeJo/master
butcallmeJo Jan 23, 2016
ae24d8d
wrapped the students list
Jan 23, 2016
58a8c6e
asked a question
madejean Jan 23, 2016
2c7ba7d
My addition to the file
Jan 23, 2016
3d69de4
Merge pull request #1 from afrancisboeuf/wraptext
afrancisboeuf Jan 23, 2016
1a913c8
fetching
Jan 23, 2016
b8762b2
Merge remote-tracking branch 'refs/remotes/origin/master'
Jan 23, 2016
305b29b
Merge pull request #50 from afrancisboeuf/master
nbveroczi Jan 23, 2016
321afe5
add more change text to end
mason-fish Jan 23, 2016
76b64ff
Merge pull request #51 from madejean/marine
madejean Jan 23, 2016
634ddb9
add random text
mason-fish Jan 23, 2016
22fda32
Adding my stuff...
havk64 Jan 23, 2016
3693211
Merge pull request #54 from mason-fish/mason_branch_2
butcallmeJo Jan 23, 2016
e6fd257
edit
madejean Jan 23, 2016
ea1c859
Accepting suggestions from reviewer...
havk64 Jan 23, 2016
aa9e1eb
steven was here
Jan 23, 2016
8ec8873
Merge pull request #56 from havk64/alex
mason-fish Jan 23, 2016
8f80e8c
Merge pull request #60 from stvngrcia/master
dalzuga Jan 23, 2016
96722b2
Merge pull request #59 from madejean/marine
bilalbarki Jan 23, 2016
0d9edc4
Edited the file
Jan 23, 2016
4068b5f
Removed random text
butcallmeJo Jan 23, 2016
be62362
Merge remote-tracking branch 'upstream/master' into rickharris-dev-ri…
rickharris-dev Jan 23, 2016
0d338b2
Merge branch 'rickharris-dev-rick_harris' into rick_harris
rickharris-dev Jan 23, 2016
408cf07
added a line
bilalbarki Jan 23, 2016
2207952
Merge pull request #63 from Praylin/expbranch
afrancisboeuf Jan 23, 2016
94386a5
Merge pull request #52 from rickharris-dev/rick_harris
nbveroczi Jan 23, 2016
7f6d059
Merge pull request #65 from bilalbarki/my_feature
madejean Jan 23, 2016
643a0cf
author added
afrancisboeuf Jan 23, 2016
0f20664
Revert "added a line"
madejean Jan 23, 2016
7b42247
Merge pull request #68 from holbertonschoolstudents/revert-65-my_feature
madejean Jan 23, 2016
58a69ba
added the fist name
afrancisboeuf Jan 23, 2016
e0d27ea
Merge pull request #67 from afrancisboeuf/master
nbveroczi Jan 23, 2016
c790379
THE END
nbveroczi Jan 23, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions RandomLatinWords.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque augue enim, pellentesque eget aliquet id, rutrum iaculis mi. Duis non semper est. Phasellus congue a urna eu vestibulum. Cras velit mi, aliquam et ligula ut, condimentum tincidunt diam. Nulla maximus turpis enim. Etiam sollicitudin sodales quam sit amet ullamcorper. Proin euismod laoreet nisl, eget tristique lectus finibus a. Etiam ultricies, ligula ut hendrerit euismod, arcu mi interdum mi, nec lacinia orci risus at est. Suspendisse sed tincidunt ex. Aliquam varius nec purus quis posuere. Aenean sed lacus id lacus condimentum egestas non eu augue. Nulla convallis aliquet diam vel interdum. Pellentesque in vehicula nunc, ut bibendum ligula. Nam lacus diam, tincidunt in porttitor vel, bibendum sit amet lorem. Sed rhoncus a sem at placerat. Vivamus pulvinar a sem in blandit.

Donec cursus sem elit, non dapibus erat rutrum ac. Sed quis eros eu ligula suscipit venenatis sit amet vel ipsum. Pellentesque scelerisque mauris tortor, vitae rhoncus massa bibendum vel. Nulla vel sapien sed nibh tincidunt pulvinar. Sed at eros dignissim, viverra urna vitae, imperdiet quam. Aliquam erat volutpat. Nullam metus erat, auctor in tortor sit amet, dignissim hendrerit nisl. Nullam ut lacinia ligula. Vestibulum purus ipsum, laoreet at consequat sed, porttitor id augue. Mauris tempor, dui nec pellentesque gravida, odio sem dapibus diam, eget varius leo tortor non elit.

In hac habitasse platea dictumst. Fusce finibus libero ac dolor blandit, eu dignissim sapien commodo. Nulla aliquam nulla et sollicitudin sodales. Integer laoreet, justo consequat porta suscipit, elit lacus hendrerit ex, sit amet feugiat ante lacus ac orci. Nam a lectus quis risus interdum tincidunt non eu augue. Nam feugiat, justo nec euismod aliquam, est mi ullamcorper sapien, sit amet scelerisque leo arcu tristique ipsum. Phasellus bibendum eu purus sed mollis. Sed sollicitudin ex ut massa vestibulum fringilla. Vivamus pretium luctus tempus. Ut pellentesque est diam, et mollis justo hendrerit non. Nulla facilisi. Integer non magna sem. Nam tempor accumsan arcu. Etiam vehicula maximus dui vitae rutrum. Etiam vitae leo a lacus malesuada laoreet euismod ac leo. Nunc augue ipsum, accumsan a varius sed, dignissim et dolor.

Pellentesque molestie enim nisl, maximus volutpat erat vestibulum eu. Aliquam eget mollis sem, at cursus ipsum. Duis quis semper ligula. Nullam sed volutpat nibh. Mauris sed tempor ex. Curabitur consequat ultricies euismod. In hac habitasse platea dictumst. Donec vitae dui risus. Morbi et libero scelerisque, vehicula lectus quis, semper nisi. Morbi tincidunt ex nec sodales maximus. Aliquam nec risus enim. Duis nec ex velit.

Integer turpis turpis, consequat id auctor at, elementum ut neque. Donec eleifend, ante a lobortis aliquam, ligula sapien gravida nunc, et ullamcorper ante tellus eu eros. Ut imperdiet tempus ipsum, id tincidunt velit laoreet id. Donec facilisis justo eget aliquet malesuada. Nullam accumsan justo eget felis placerat, non aliquam neque lacinia. Proin venenatis turpis sed fringilla ultrices. Pellentesque fermentum ipsum vitae ante venenatis vehicula. Nulla tristique metus in posuere semper. Nam volutpat sed dui sed pharetra. Phasellus eleifend libero a sapien posuere suscipit. Etiam vel tristique purus. Morbi eget tincidunt leo. Mauris aliquet fringilla felis id semper.

Julius Cesar
34 changes: 34 additions & 0 deletions credits.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Name; github account

Damian Ali; DamianAli
Alexandro de Oliveira; havk64
Asaia Palacios; asaiapalacios
Augustin "Gus" Francis-Boeuf; afrancisboeuf
Bennet Buchanan; bennettbuchanan
Bilal Khan; bilalbarki
Siphan Bou; Siphan
Chandler Mayo; chandler767
Daniel Alzugaray; dalzuga
Dora Korpar; DoraKorpar
Electra Chong; electrachong
Gloria Bwandungi Mugarura
Ian Wagener; IanWagener
Jacob Ekanem
John Serrano; johnSerrano
John Spence; johnjohn987
Joe Greene;
Josh Parkin
Josquin "Jo" Gaillard; butcallmeJo
Kris Bredemeier; krisbredemeier
Zee Adams; wabluekey
Marine Dejean; madejean
Mason Fish; mason-fish
Naomi Veroczi; nbveroczi
William McCann; WilliamMcCann
Praylin Dinamoni; Praylin
Rick Harris
Rick Houser
Rona Chong; ronachong
Sravanthi Sinha; SravanthiSinha
Steven Garcia; stvngrcia
Tasneem Farag; tasneemfarag
6 changes: 6 additions & 0 deletions expfile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Another experimental file for git

This is the file I created to work on the branch.



113 changes: 90 additions & 23 deletions screenplay.txt
Original file line number Diff line number Diff line change
@@ -1,72 +1,139 @@
A FIRST DAY AT HOLBERTON SCHOOL
steven was here
or

Written by

The Holberton School Students
GIT: you know you love it!

Written by:

The Holberton School Students - January 2016 batch

Students: Damian Ali, Alexandro de Oliveira, Asaia Palacios, Augustin
"Gus" Francis-Boeuf, Bennet Buchanan, Bilal Khan, Siphan Bou, Chandler
Mayo, Daniel Alzugaray, Dora Korpar, Electra Chong, Gloria Bwandungi
Mugarura, Ian Wagener, Jacob Ekanem, John Serrano, John Spence, Joe
Greene, Josh Parkin, Josquin "Jo" Gaillard, Kris Bredemeier, Zee
Adams, Marine Dejean, Mason Fish, Naomi Veroczi, William McCann,
Praylin Dinamoni, Rick Harris, Rick Houser, Rona Chong, Sravanthi
Sinha, Steven Garcia, Tasneem Farag

FADE IN:


INT. HOLBERTON SCHOOL ENTRANCE - DAY

DAVID walks into the school, and there are already groups of people talking together. JANE and HARRY walk up to him.
(DAVID walks into the school, and there are already groups of people talking together. JANE and HARRY walk up to him.)

DAVID smells bacon grilled cheese and realizes he is hungry.

JANE
JANE: (Exclaming) Hi, you're David right? I recognize you from your picture on the Slack channel!

Hi, you're David right? I recognize you from your picture on the Slack channel!
DAVID: Yes, indeed. Jane and Harry, right? Have you guys been here long?


DAVID
HARRY:We just arrived. I think everybody did, really.


Yes, indeed. Jane and Harry, right? Have you guys been here long.
DAVID:Perfect, let's go build an aquarium!

INT. HOLBERTON SCHOOL, BRIGHT OPEN SPACE - DAY

DAVID is now with AMY, they're working in pair to move forward on the Git project.

HARRY
AMY

We just arrived. I think everybody did, really.
Have you ever [DRAMATIC PAUSE] used Git?


DAVID

Perfect, let's go meet the other people!
I heard of it, but never used it. I did use SVN in a group project I did in college though. How about you?


AMY

I actually used Git when I built a website for my chess club. But I was the only one doing the project, so I barely scratched the surface.

INT. HOLBERTON SCHOOL OPEN SPACE - DAY

DAVID is now with AMY, they're working in pair to move forward on the Git project.
DAVID

Oh, we'll definitely be able to learn from each other then!



AMY

Sounds like it! Do you speak Latin?

AMY

Have you ever used Git?
Tempus Fugit! I gotta go!

(AMY exits...)


DAVID

I heard of it, but never used it. I did use SVN in a group project I did in college though. How about you?
I didn't know that you could use SSH keys to authenticate. Do you like pizza?

NAOMI

AMY
not really

I actually used Git when I built a website for my chess club. But I was the only one doing the project, so I barely scratched the surface.
NAOMI

Coffee needs to be a little stronger!

DAVID
DANIEL

Oh, we'll definitely be able to learn from each other then!
Are we ever, EVER done?

GUS

AMY
I'm here to help!

NAOMI

Thanks for telling me to add some details GUS!


Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque augue enim, pellentesque eget aliquet id, rutrum iaculis mi. Duis non semper est. Phasellus congue a urna eu vestibulum. Cras velit mi, aliquam et ligula ut, condimentum tincidunt diam. Nulla maximus turpis enim. Etiam sollicitudin sodales quam sit amet ullamcorper. Proin euismod laoreet nisl, eget tristique lectus finibus a. Etiam ultricies, ligula ut hendrerit euismod, arcu mi interdum mi, nec lacinia orci risus at est. Suspendisse sed tincidunt ex. Aliquam varius nec purus quis posuere. Aenean sed lacus id lacus condimentum egestas non eu augue. Nulla convallis aliquet diam vel interdum. Pellentesque in vehicula nunc, ut bibendum ligula. Nam lacus diam, tincidunt in porttitor vel, bibendum sit amet lorem. Sed rhoncus a sem at placerat. Vivamus pulvinar a sem in blandit.

Donec cursus sem elit, non dapibus erat rutrum ac. Sed quis eros eu ligula suscipit venenatis sit amet vel ipsum. Pellentesque scelerisque mauris tortor, vitae rhoncus massa bibendum vel. Nulla vel sapien sed nibh tincidunt pulvinar. Sed at eros dignissim, viverra urna vitae, imperdiet quam. Aliquam erat volutpat. Nullam metus erat, auctor in tortor sit amet, dignissim hendrerit nisl. Nullam ut lacinia ligula. Vestibulum purus ipsum, laoreet at consequat sed, porttitor id augue. Mauris tempor, dui nec pellentesque gravida, odio sem dapibus diam, eget varius leo tortor non elit.

In hac habitasse platea dictumst. Fusce finibus libero ac dolor blandit, eu dignissim sapien commodo. Nulla aliquam nulla et sollicitudin sodales. Integer laoreet, justo consequat porta suscipit, elit lacus hendrerit ex, sit amet feugiat ante lacus ac orci. Nam a lectus quis risus interdum tincidunt non eu augue. Nam feugiat, justo nec euismod aliquam, est mi ullamcorper sapien, sit amet scelerisque leo arcu tristique ipsum. Phasellus bibendum eu purus sed mollis. Sed sollicitudin ex ut massa vestibulum fringilla. Vivamus pretium luctus tempus. Ut pellentesque est diam, et mollis justo hendrerit non. Nulla facilisi. Integer non magna sem. Nam tempor accumsan arcu. Etiam vehicula maximus dui vitae rutrum. Etiam vitae leo a lacus malesuada laoreet euismod ac leo. Nunc augue ipsum, accumsan a varius sed, dignissim et dolor.

Pellentesque molestie enim nisl, maximus volutpat erat vestibulum eu. Aliquam eget mollis sem, at cursus ipsum. Duis quis semper ligula. Nullam sed volutpat nibh. Mauris sed tempor ex. Curabitur consequat ultricies euismod. In hac habitasse platea dictumst. Donec vitae dui risus. Morbi et libero scelerisque, vehicula lectus quis, semper nisi. Morbi tincidunt ex nec sodales maximus. Aliquam nec risus enim. Duis nec ex velit.


CHANDLER & JOSH TALKING ABOUT GIT

CHANDLER MAYO

Have you ever used Github before?

JOSH PARKIN

Not really, I am more used to Bitbucket.

CHANDLER

Same!

Integer turpis turpis, consequat id auctor at, elementum ut neque. Donec eleifend, ante a lobortis aliquam, ligula sapien gravida nunc, et ullamcorper ante tellus eu eros. Ut imperdiet tempus ipsum, id tincidunt velit laoreet id. Donec facilisis justo eget aliquet malesuada. Nullam accumsan justo eget felis placerat, non aliquam neque lacinia. Proin venenatis turpis sed fringilla ultrices. Pellentesque fermentum ipsum vitae ante venenatis vehicula. Nulla tristique metus in posuere semper. Nam volutpat sed dui sed pharetra. Phasellus eleifend libero a sapien posuere suscipit. Etiam vel tristique purus. Morbi eget tincidunt leo. Mauris aliquet fringilla felis id semper.

MARINE
Who's AMY?
?

FADE OUT, CURAIN GOES DOWN :).

Sounds like it!
Finally, everyone shouted... "We had an awesome day.... Amazing days ahead..."

Almost the end(like Beethoven Symphonies)
Ode to Joy

FADE OUT.
THE END
ITS NOT THE END

THE END
THIS IS A CHANGE BY BENNETT BUCHANAN, but now it is also a change by mason fish. ""
1 change: 1 addition & 0 deletions updatedfile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hey guys, Just checking git commits..
8 changes: 8 additions & 0 deletions zx6r.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
KAWASAKI NINJA ZX6R

599cc I-4


===========================

Josquin Gaillard