Change column from Characters to Subjects
Separate artifacts csv by semicolon and fix redundancy
Update csvs and switch to semicolon delimiter
Added ingredients to Potion.csv
update artifacts views
update characters with book subjects and correct links
Merge branch 'align_with_model_changes' of github.com:Kae7in/cs373-idb into align_with_model_changes
align potions with new model changes
Merge branch 'master' into align_with_model_changes

Conflicts:
	hogwarts/marauder/templates/potions/1.html
	hogwarts/marauder/templates/potions/2.html
	hogwarts/marauder/templates/potions/3.html
Merge pull request #154 from Kae7in/align_with_model_changes

Align with model changes