fixed spelling error in spell difficulty
for pull request on spell changes
Merge pull request #245 from Kae7in/spell_difficulty

Spell difficulty
fix #246, homepage still static
Merge pull request #247 from Kae7in/static_homepage

fix #246, homepage still static
backup db
Merge pull request #249 from Kae7in/backup_db

backup db
adding dynamic character template and routes
merge with master
add sex to characters and make wand optional
Merge pull request #250 from Kae7in/null_character_fields

add sex to characters and make wand optional
update sexes of characters
Merge pull request #251 from Kae7in/backup_db

update sexes of characters
Added PotionRestView Function and updated urls.py
Merge branch 'master' into character_dynamic_pages

Conflicts:
	hogwarts/backup.json
	hogwarts/marauder/urls.py
	hogwarts/marauder/views.py
make wands actually null, not empty string
Merge pull request #252 from Kae7in/backup_db

make wands actually null, not empty string
Merge branch 'master' of github.com:Kae7in/cs373-idb into character_dynamic_pages

Conflicts:
	hogwarts/backup.json
Merge pull request #253 from Kae7in/david-api

David api
finish character dynamic detail view