history
Merge https://github.com/saykorz/ShouldIEatThatFood

Conflicts:
	ShouldIEatThatFood/app/app.js