Added potions to tables.py
Modified potions in views.py
Fixed Potion part of urls.py
creature index
Merge branch 'master' of https://github.com/Kae7in/cs373-idb into index_potions

Conflicts:
	hogwarts/marauder/tables.py
Merge branch 'master' of github.com:Kae7in/cs373-idb

Conflicts:
	hogwarts/marauder/tables.py
	hogwarts/marauder/templates/base.html
	hogwarts/marauder/templates/index.html
Merge pull request #285 from Kae7in/index_potions

Added potions to tables.py
fixed potions view (AH)
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-api

Conflicts:
	hogwarts/marauder/views.py