resources
Merge branch 'master' of https://github.com/sabotuer99/flaming-octo-robot

Conflicts:
	OdeToFoodGit/Web.config