asdkjahsdf
Merge branch 'master' of https://github.com/phenomnomnominal/Happyness

Conflicts:
	app/views/home/index.liquid