Added Stuff
Merge pull request #20 from wynestic/master

Added stuff