Yes conflicts
Merge branch 'master' of https://github.com/fieldhof/2.1InternetTechnologie

Conflicts:
	src/client/Client.java