adding devise views
devise views in haml now
added name to devise registrations
Merge branch 'master' into dspstanky

Conflicts:
	app/views/home/index.html.haml
	app/views/layouts/application.html.haml
	db/schema.rb
So CSS. Much wow.
Quick update to stylesheet and javascript
resolved conflicts
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
restoring footer
Less eye-bleeding color scheme
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
adding spell tab again
messed with linking spells
added consumable items
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