bleh
Merge branch 'master' of github.com:stuycs-softdev/proj3-CrowdHunts into yaseen
Merge branch 'master' of github.com:stuycs-softdev/proj3-CrowdHunts into yaseen
made updt_geo_pic()
Merge branch 'master' of github.com:stuycs-softdev/proj3-CrowdHunts into yaseen
jfc wrote add_tour() holy crap twice gahhhh
moving shtuff around
important step i forgot
gah im dead, i swear
removing placeholder text
ajaxxxxxx
removvvvve
Merge branch 'yaseen' of github.com:stuycs-softdev/proj3-CrowdHunts into will
Merge branch 'master' of github.com:stuycs-softdev/proj3-CrowdHunts into will

Conflicts:
	templates/test.html
test.html
test
README + db updates to user schema
db
MASSIVE DATABASE OVERHAUL
calling it like it is