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.
messing with feats and skills
Quick update to stylesheet and javascript
post migrate schema update
resolved conflicts
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
restoring footer
Merge branch 'master' into rob
Less eye-bleeding color scheme
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
adding spell tab again
messed with linking spells
adding ability skills to score
extracting stuff from srd
Merge branch 'master' of github.com:DnDCity/DnDCity
Merge branch 'justin'

Conflicts:
	db/schema.rb