Maxified css
Merge branch 'master' of https://github.com/benmb1984/merging_movements

Conflicts:
	source/style/main.css