- Back to normal view ...
- Settings / Preferences ...
Merge branch 'master' of https://github.com/M0rtel/TheGermanBakery.git

Conflicts:
	bin/TheGermanBakery.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/thegermanbakery/R.java