Wtf
Settings.xml
All the stuff
Merge amepe/Client

Conflicts:
	.gitignore
	Client/src/client/Main.java