gh-pages updated with theme
resolving merge conflict