Added more stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	NutraSentry02/www/index.html