Merge pull request #18 from TopherJonesy/gh-pages

Merge pull request #17 from TopherJonesy/master
Merge pull request #19 from TopherJonesy/master

wtf github...???