Merge branch 'master' of github.com:Kae7in/cs373-idb
Merge branch 'david-api' of github.com:Kae7in/cs373-idb
Merge branch 'david-api' of github.com:Kae7in/cs373-idb
add house index view
potions are never hidden, so dont check for that
#309 show creature info for character detail view
update character table links
call correct relation in list
Merge pull request #312 from Kae7in/fix_relationship_list

call correct relation in list
Merge branch 'master' of github.com:Kae7in/cs373-idb
Merge pull request #311 from Kae7in/update_table_links

update character table links
Merge branch 'david-api' of github.com:Kae7in/cs373-idb
Merge pull request #310 from Kae7in/fix_creature_in_characters

#309 show creature info for character detail view
Merge pull request #307 from Kae7in/house_index_view

add house index view
Merge pull request #308 from Kae7in/fix_potion_routing

potions are never hidden, so dont check for that #292
Merge branch 'david-api' of github.com:Kae7in/cs373-idb
add string representation for relationships
Merge pull request #313 from Kae7in/relationship_str

add string representation for relationships
style changes, minor
Merge branch 'master' of github.com:Kae7in/cs373-idb