messing with feats and skills
Merge branch 'master' into rob
added a spells tab
adding spell tab again
messed with linking spells
Added very basic scaffolding for CharacterClasses
Fixed the broken migration
Fixed the views
Merge branch 'master' into justin

Conflicts:
	db/schema.rb
adding ability skills to score
extracting stuff from srd
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
added consumable items
Parsing Character Class and Skills
adding classes to skill show
Merge branch 'master' into nate

Conflicts:
	app/views/layouts/_navigation_links.html.haml
	config/routes.rb
	db/schema.rb
Merge branch 'master' into dspstanky

Conflicts:
	Gemfile.lock
	db/schema.rb