LoLOOLOL
Merge pull request #3 from JoelHoskin/master

Joel & Jon