v.011

error correction, html, css
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/main-style.css