Progress on saving objects to parse, and updating to Adam's changes
Merge branch 'master' of https://github.com/bruckna/DoesMyShitFit

Conflicts:
	layout.html