Jon's name added.
merged conflicts
Merge pull request #7 from jonthedecepticon/master

Added Jon's name