Work completed on char-based GUI
Merge branch 'master' of https://github.com/robertquitt/APCS.git

Conflicts:
	APCSGit/src/source/Player.java