My changes
Merge branch 'master' of https://github.com/juueli/FIXSTHML

Conflicts:
	css/style.css