Displaying player on screen.
Merge branch 'master' of github.com:andrewtsoc/2DCraft

Conflicts:
	src/MainGui.java
	src/MapPanel.java