committing changes to allow deploy
merged gh-pages