Friday
Merge branch 'master' of https://github.com/mgpepe/173-amity

Conflicts:
	app/View/Statics/home.ctp