Imported javascript frameworks.
javascript.tag implemented and funtional; require.js  and jquery are imported.
marionette plugged in and mapped. Having trouble getting the backbone.fetch() method to connect to the spring controller.
backbone.fetch() now successfully updates the model.
Merge pull request #1 from phowland1/peter-dev

marionette plugged in and mapped. Having trouble getting the backbone.fe...
Implemented global.css and added some functions to CharacterView
Merge pull request #3 from phowland1/peter-dev

Peter dev
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
Merge pull request #1 from phowland1/dev

Dev