More layout/CSS
Merge branch 'master' of github.com:kamilski81/socialcrunch-smk

Conflicts:
	app/views/home/the_end.haml
More layout/CSS