dsfdasf
a
Merge branch 'master' of
https://github.com/lukashaidacher/ThinkingCO2.git

Conflicts:
	GuiTest/src/com/example/guitest/LoginActivity.java