settings
Merge branch 'master' of https://github.com/lrehmann/cahoot

Conflicts:
	Cahoot-App/.gradle/1.12/taskArtifacts/cache.properties.lock
	Cahoot-App/.gradle/1.12/taskArtifacts/fileHashes.bin
	Cahoot-App/.gradle/1.12/taskArtifacts/fileSnapshots.bin
	Cahoot-App/.gradle/1.12/taskArtifacts/outputFileStates.bin
	Cahoot-App/.gradle/1.12/taskArtifacts/taskArtifacts.bin
	Cahoot-App/.idea/workspace.xml
	Cahoot-App/build/intermediates/model_data.bin
	Cahoot-App/local.properties