REALLY fixed merge conflicts
Merge pull request #3 from shindostrz/gh-pages

REALLY fixed merge conflicts