Adding hike details
some experience stuff
added more details to hikes
Merge branch 'master' of https://github.com/Kae7in/cs373-idb into otherapi

Conflicts:
	hogwarts/marauder/otherapi.py
	hogwarts/marauder/templates/experience.html
Fixed potential bug for getting parks in API; added more detail for hikes
removing local settings file
quick Voldemort comment code
adding master settings.py back in in case merge issues
Merge pull request #442 from Kae7in/otherapi

Otherapi