creature index
Merge branch 'master' of github.com:Kae7in/cs373-idb

Conflicts:
	hogwarts/marauder/tables.py
	hogwarts/marauder/templates/base.html
	hogwarts/marauder/templates/index.html