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.
Dynamic images
Merge branch 'master' into generalize_otherapi

Conflicts:
	hogwarts/marauder/templates/experience.html