.idea files converted to relative paths.
Merge branch 'master' of https://github.com/dadewitt/Food-Simulator

Conflicts:
	MyApplication/.idea/gradle.xml
	MyApplication/MyApplication.iml
	MyApplication/app/app.iml