Merge branch 'master' of https://github.com/edunton/Gamified-Nutrition

Conflicts:
	scripts/registration.js