Merge pull request #9 from mammothbane/john

itsworking.gif
moved tests
Merge branch 'john'
cleaned up directory