Resharper Files
Merge branch 'master' of github.com:jnader051479/OdeToFood

Conflicts:
	OdeToFood.v11.suo
merge conflict