Factored select options into model file
Added character edit page
Fixed conflicts
added edit links on show page