temp commit
Merge branch 'master' of https://github.com/foodplanner/foodplanner.github.io

Conflicts:
	login.js