Initial commit
fixed merge conflicts
after deleing gh-pages