results
Merge branch 'master' of https://github.com/saykorz/ShouldIEatThatFood

Conflicts:
	ShouldIEatThatFood.v12.suo
	ShouldIEatThatFood/app/view-models/history-view-model.js
Merge branch 'master' of https://github.com/saykorz/ShouldIEatThatFood