jeffweiss/intern-test — pull request #25 by briancain (2013-05-28 21:00:43+00:00)
Title: Modify email file

Prior to this commit, my_email had Jeffs email address. This commit
changes that file and adds my own email which should cause merge
conflicts.