Character.getCharacter fixed
Added charizard
Merge branch 'master' of github.com:chrisn21/team6

Conflicts:
	src/main/java/com/team6/app/Character.java