Fix gitignore
Merge branch 'working' into gh-pages
Fix css