Starting move of player movement to Level class
Attempting to figure out how merge works for git
Merge branch 'master' of https://github.com/matblair/SWEN30006

Conflicts:
	src/gamestates/GameState.java
This is a pretty useless commit