fjdkal
Merge branch 'master' of https://github.com/evanthebouncy/foodaware

Conflicts:
	summary.html