Main image styling
Merge branch 'master' of https://github.com/planemaniac/brunton

Conflicts:
	app/styles/main.scss