Css Update
Merge branch 'master' of https://github.com/debfryap/qerja

Conflicts:
	css/style.css