Blargh
Merge branch 'master' of https://github.com/Valent1n/2014-02-24-Netvaerksspil
Merge branch 'master' of https://github.com/Valent1n/2014-02-24-Netvaerksspil
kljhgfv
Merge branch 'master' of
https://github.com/Valent1n/2014-02-24-Netvaerksspil

Conflicts:
	src/server/NetworkServer.java