Overhauled Character.java to work with character creation controllers.
Merge branch 'controller/Ian/dev'
Merge branch 'master' of https://github.com/vcnickerson/CS2340Project

Conflicts:
	SpaceTraders/nbproject/private/private.xml