added a spells tab
Added very basic scaffolding for CharacterClasses
Fixed the broken migration
Fixed the views
Merge branch 'master' into justin

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:DnDCity/DnDCity
Merge branch 'justin'

Conflicts:
	db/schema.rb
Merge branch 'master' into rob

Conflicts:
	app/views/layouts/_navigation_links.html.haml
Parsing Character Class and Skills