jeffweiss/intern-test — pull request #32 by hogepodge (2013-06-03 23:51:18+00:00)
Title: (demo) Change the email in my_email to be my email.

Prior to this commit the email address in the file was not mine.
This commit changes the email address to be mine, and surely
introduces a conflict into the file.