no message
Merge branch 'FinalDemo' of https://github.com/404Tracker/ChefNetwork into FinalDemo

Conflicts:
	.gradle/2.2.1/taskArtifacts/cache.properties
	.gradle/2.2.1/taskArtifacts/cache.properties.lock
	.gradle/2.2.1/taskArtifacts/fileHashes.bin
	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.2.1/taskArtifacts/outputFileStates.bin
	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	.idea/misc.xml
	ChefNetwork.iml
	app/app.iml
	app/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
no message