Merge pull request #35 from lindboe/master

Added text to file1
Merge pull request #36 from lindboe/master

Added new line
add donut description
(maint) add my email to the file

Prior to this commit, the file only contained the
email of previous interns. This commit adds the new
interns email.
Merge pull request #37 from ericwilliamson/maint/master/add_my_details_to_myemail

(maint) add my email to the file
(maint) add a change for learning

Prior to this commit, there were no local modifications
waiting to be commited for a pull request. This commit modifies
a file so a pull request can be made.
(maint) change file2

Prior to this commit file2 had a poem or an incorrect hiaku.
This commit asks for clarification as to which it is.
Merge pull request #38 from ericwilliamson/maint/master/add_additional_commit_after_pull_request

(maint) add a change for learning
(maint) modify file3

Prior to this commit file3 had not been modified by the new intern.
This commit has changes from the new intern.
Merge pull request #39 from ericwilliamson/maint/master/add_message_to_pull_request

(maint) modify file3
change to force eric williamson to rebase
force eric to handle a merge conflict here too
(maint) make file1 smart

Prior to this commit file1 spoke gibberish. This commit
changes it to speaking smartly.
(maint) use consistent whitespace

Prior to this commit file3 would use inconsistent line length.
This commit changes it to use 80 char line length.
Merge pull request #40 from ericwilliamson/maint/master/practice_rebasing

(maint) edit file for rebase
(maint) make people hungry

Prior to this commit people were getting tired of just one donut.
This commit allows a second option - chocolate with sprinkles.
Merge pull request #41 from ericwilliamson/maint/master/add_more_donuts

(maint) make people hungry