fix lengths and delete nonexistant links
Merge branch 'master' into fix_links

Conflicts:
	hogwarts/marauder/templates/spells/2.html
Merge pull request #164 from Kae7in/fix_links

fix lengths and delete nonexistant links