Merge pull request #51 from theshanx/master

added tiffany's email box
Add my info to  my_email

In the beginning there was the void. Now the void contains my email address,
and it was Good.
Merge pull request #52 from gchronis/feature/master/edit_my_email

Add my info to  my_email
Add candy contest to file1

Before this commit there was no mention of red candy in file1.
All files should mention red candy, so now it does.
Add red candy to file2

Before this commit there was no mention of red candy in file2.
This was a problem and is now resolved.
Merge pull request #53 from gchronis/feature/master/edit_file1

Add candy contest to file1
Modify file3

Before this commit there were fewer modifications to file3. Now
there are more modifications. Added a topic to focus the content.
Merge pull request #54 from gchronis/feature/master/edit_file3

Modify file3
Merge conflict for gchronis. You're welcome.
Delete contents of nates_file

Before this commit there was text in nates_file that didn't belong there.
This commit removes it.
Merge pull request #55 from gchronis/feature/master/edit_nates_file

Delete contents of nates_file
(Ticket #) Add information to my email

Prior to this commit, my email was absent from my_email
This commit adds my information to this document so that all the world may email me
(Ticket #)  Updating my_email

Prior to this commit, my email was not in the file
This commit makes my email available to everyone to see
Merge pull request #56 from nudibranch/class/master/edit_my_email

(Ticket #) Add information to my email
Merge pull request #58 from pamelaju/class/master/1_changes_to_my_email_file

(Ticket #)  Updating my_email
Here is my new message.
Thus, was the bear added back.
Merge pull request #59 from vernelindner/test/master/test_for_git_branching

Here is my new message.
a rouge text file appears