implemented PlayerSelectScreen
Merge branch 'master' of github.com:calvcoll/TestGame

Conflicts:
	src/cc/game/TestGame/World.java
	src/cc/game/TestGame/entities/Enemy.java
	src/cc/game/TestGame/entities/Entity.java
	src/cc/game/TestGame/entities/Player.java
	src/cc/game/TestGame/entities/PlayerDevArt.java
	src/cc/game/TestGame/entities/pickups/Pickup.java
	src/cc/game/TestGame/screen/PlayerSelectScreen.java
Merge branch 'master' into dev
Merging in master to keep up-to-date, ready for a later re-merging