stashing for branch checkout
creature tests passing
Merge branch 'david-search' of https://github.com/Kae7in/cs373-idb into david-search
all tests passing
added search tests for Spells and Artifacts
added search tests for Spells and Artifacts
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-search

Conflicts:
	hogwarts/marauder/tests.py
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-search
Merge pull request #418 from Kae7in/david-search

Bringing david-search and master in sync