Modify my_email to be my (Nate's) email
Merge pull request #27 from shakedown/learn_git_merge_conflicts_2013

Modify my_email to be my (Nate's) email