adding spells to database
added a spells tab
Merge branch 'master' into justin

Conflicts:
	db/schema.rb