Merge pull request #2 from zethussuen/master

Um i hope i dont break it
Merge pull request #3 from zethussuen/gh-pages

Here goes nothing