removed ingredient_text.txt
fixed error that results form searching a blank line
Merge pull request #427 from Kae7in/fixsearch

fixed error that results form searching a blank line
Merge pull request #425 from Kae7in/removeIngredients

removed ingredient_text.txt
Added shop attribute to Artifact detail page. Resolves #319.
Merge branch 'master' of github.com:Kae7in/cs373-idb into issue319
Adding links to twistory to experience
Merge branch 'master' of github.com:Kae7in/cs373-idb
Merge pull request #428 from Kae7in/issue319

Issue319
Updated tests.out. Resolves #432.
Merge pull request #433 from Kae7in/issue432

Updated tests.out. Resolves #432.
make our user of other api generic
Dynamic images
Merge branch 'master' into generalize_otherapi

Conflicts:
	hogwarts/marauder/templates/experience.html
Merge pull request #434 from Kae7in/generalize_otherapi

make our user of other api generic
corrected typo Catagories to Categories
fixed typoe in base.html, Catagories to Categories
Merge pull request #436 from Kae7in/fixTypo

Fix typo
Small changes to wording in experience
Merge branch 'master' of github.com:Kae7in/cs373-idb