Image Rotation Stuff
Merge branch 'master' of https://github.com/rkreiter/javaProject4

Conflicts:
	src/server/StartServer.class