Merged styling
Merge branch 'master' into Step4

Conflicts:
	app/styles/main.css