Authentifizierung getestet
conflicts

Conflicts:
	bin/R.txt
	bin/classes/ch/falksolutions/todo/DataHandler.class
	bin/classes/ch/falksolutions/todo/LogInActivity$userLogin.class
	bin/classes/ch/falksolutions/todo/LogInActivity.class
	bin/classes/ch/falksolutions/todo/MainActivity$1.class
	bin/classes/ch/falksolutions/todo/MainActivity$GetContent.class
	bin/classes/ch/falksolutions/todo/MainActivity$PutContent.class
	bin/classes/ch/falksolutions/todo/MainActivity.class
	gen/ch/falksolutions/todo/R.java
	src/ch/falksolutions/todo/DataHandler.java
	src/ch/falksolutions/todo/LogInActivity.java
	src/ch/falksolutions/todo/MainActivity.java