fix page 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/style.css
mas fixes
Merge branch 'master' of https://github.com/adieldccolor/wyhtk

Conflicts:
	assets/css/style.css