fixed
fixed
Merge pull request #6 from tehfreak/gh-pages

fixed conflict