Merge branch 'master' of https://github.com/RWojtas/SEWS13.git

Conflicts:
	src/main/GraphicManager.java
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git