Character scaffold add
Merge branch 'origin/master'

Conflicts:
	app/models/character.rb
	db/schema.rb
	spec/factories/characters.rb