got player to render
got player to render
Merge origin/master

Conflicts:
	src/main/GameLevel.java
Got player1 to render