Efendi tirtil
Merge branch 'develop' of https://github.com/gsalgun/GreedyUSO into develop

Conflicts:
	.idea/workspace.xml
	core/src/main/java/GreedyUSO/core/view/GameScreen.java