weird git thingy.
I wonder if this will push all my updates.
Merge pull request #2 from kevingimbel/master

Merging master and gh-pages branche