merge conflicts
Merge pull request #15 from staycebella/gh-pages

merge conflicts