Merge remote-tracking branch 'origin/master'

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/modules.xml
	.idea/workspace.xml
	app/app.iml
	app/src/main/java/com/example/lanfear/tamahakan/DrawGraphics.java
	app/src/main/java/com/example/lanfear/tamahakan/HungerView.java
	app/src/main/java/com/example/lanfear/tamahakan/IntelligenceView.java
	app/src/main/java/com/example/lanfear/tamahakan/MoodView.java
	app/src/main/java/com/example/lanfear/tamahakan/Play.java
	app/src/main/res/layout/activity_play.xml
	build/intermediates/model_data.bin