Started on equipment page of new char controller.
added "type" column to armor
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/partials/NewCharacterController.java