Made the API functions handle both collection and item requests.
implemented SpellRestView and ShopRestView in views.py
updated urls.py to include references to spells and shops
angela-settings
Merge branch 'david-api' of https://github.com/Kae7in/cs373-idb into david-api
Working unit tests for detail and index API view. Also fixed url syntax.
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-api

Conflicts:
	hogwarts/hogwarts/settings.py
	hogwarts/marauder/urls.py
	hogwarts/marauder/views.py
Implemented Story REST API.
Added potion api unit tests
Added creature api test
added Artifact api and passing unit tests
Merge branch 'david-api' of https://github.com/Kae7in/cs373-idb into david-api

Conflicts:
	hogwarts/marauder/views.py
Merge branch 'david-api' of https://github.com/Kae7in/cs373-idb into isabella_testapi

Conflicts:
	hogwarts/marauder/testapi.py
Fixed creature and potion api stuff
Merge pull request #280 from Kae7in/isabella_testapi

Isabella testapi
Merge pull request #283 from Kae7in/isabella_api

Fixed creature and potion api stuff
Updated StoryRestView.
Merge branch 'david-api' of github.com:Kae7in/cs373-idb into david-api
all 7 unit tests passing api tests
Story API tests added and passing. #261.