adding dynamic character template and routes
merge with master
Merge branch 'master' into character_dynamic_pages

Conflicts:
	hogwarts/backup.json
	hogwarts/marauder/urls.py
	hogwarts/marauder/views.py
Merge branch 'master' of github.com:Kae7in/cs373-idb into character_dynamic_pages

Conflicts:
	hogwarts/backup.json
finish character dynamic detail view
add index view and django_tables2
fix style
add link to tables
add character index links
remove static pages
few more style fixes
Merge branch 'master' into character_dynamic_pages

Conflicts:
	hogwarts/marauder/urls.py
	hogwarts/marauder/views.py
Merge pull request #264 from Kae7in/character_dynamic_pages

Character dynamic pages