Merge branch 'master' of https://github.com/KernelCorp/masterpiece

Conflicts:
	app/assets/stylesheets/body.css
Merge branch 'master' of https://github.com/KernelCorp/masterpiece