pull
pulled (merged resolving theirs)
pull
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta
pull
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/GreetingService.java
	HakunaContacta/src/de/hakunacontacta/client/Page2.java
pull
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/src/de/hakunacontacta/client/ClientEngine.java
	HakunaContacta/src/de/hakunacontacta/client/Page2.java
code formatiert