Changes
Merge branch 'master' of https://github.com/me2419/Healthier-UI

Conflicts:
	js/main.js