Merge
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	src/View/MultiplayerView.java
Merge branch 'master' of https://github.com/Maestro1337/ssha.git
Merge branch 'master' of https://github.com/Maestro1337/ssha.git
merge
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	src/View/MultiplayerView.java
Removed the unused class Screen.
Merge branch 'master' of https://github.com/Maestro1337/ssha.git