developments gfx
Justified the text
Fixed conflicts and Merge branch 'master' into developmentsgui

Conflicts:
	src/model/Player.java