Half-working render code

Frames not all drawing
Game loop will now render each frame
Merge branch 'master' into renderFix

Conflicts:
	game/src/display/Renderer.java
	game/src/gameEngine/GameEngine.java