removing both target and .idea files
Studding out some of the model
making it the entire idea dir
More model changes

adding more things to the model
fixing Weapon

forgot a ; in weapon
Hopefully fixing the merge conflict
Merge branch 'master' of https://github.com/andyjwest/CharacterSheet into dev

Conflicts:
	.gitignore
	.idea/workspace.xml
	src/main/java/com/rational/controller/CharacterController.java
adding workspace.xml to gitignore
Merge branch 'dev' of https://github.com/phowland1/CharacterSheet into dev

Conflicts:
	CharacterSheet.iml
	src/main/java/com/rational/controller/CharacterController.java
	target/classes/com/rational/controller/CharacterController.class
	target/classes/com/rational/model/Character.class
remove workspace.xml from VC
Merging with dev