nichts neues
Merge remote-tracking branch 'upstream/master'
merge conflict behoben
Conflicts:
	Project/bin/classes/de/Psychologie/socialintelligence/Week.class
	Project/src/de/Psychologie/socialintelligence/Week.java
view settings
Merge remote-tracking branch 'upstream/master'
view settings
Conflicts:
	Project/AndroidManifest.xml
	Project/bin/AndroidManifest.xml
	Project/bin/classes/de/Psychologie/socialintelligence/MainActivity.class
	Project/bin/classes/de/Psychologie/socialintelligence/R$id.class
	Project/gen/de/Psychologie/socialintelligence/R.java