# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/hannover/luh/hci/gatathought/MainActivity.java
#	app/src/main/java/hannover/luh/hci/gatathought/Tamagotchi.java
#	app/src/main/java/hannover/luh/hci/gatathought/WalkActivity.java
#	app/src/main/java/hannover/luh/hci/gatathought/WalkSettings.java
#	app/src/main/java/hannover/luh/hci/gatathought/WalkWindow.java
#	app/src/main/res/values/strings.xml