Update README.md
Improve codestyle (also add some BEM)
Merge branch 'master' into gh-pages

Conflicts:
	style/main.css