created myedu file
added search fxn for university,image,department,and professor
added courseSearch
started trying to reduce runtime
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd7-03-ArmyOfDarkness into haoxin
removed unnecessary file myedu_api.py
Merge branch 'haoxin' of github.com:stuycs-softdev/proj2-pd7-03-ArmyOfDarkness into haoxin
Create jackapp.py
Update jackapp.py
Create results.html
Create city_search.html
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd7-03-ArmyOfDarkness into haoxin
made a website that shows how the data could be presented, also serves as sample code for the actual site
Update db.py
Merge pull request #4 from stuycs-softdev/haoxin

Haoxin
Merge pull request #2 from stuycs-softdev/frontend

Add navbar and pages
wefadfad
s
dfasdgfsg
dfasdgfsgwq!
erge branch 'Jack-Cahn' of https://github.com/stuycs-softdev/proj2-pd7-03-ArmyOfDarkness

wq!
:wq
Merge pull request #5 from stuycs-softdev/master

Merge City Search Functionality
Merge pull request #6 from stuycs-softdev/Jack-Cahn

Jack cahn
Merge branch 'master' of https://github.com/stuycs-softdev/proj2-pd7-03-ArmyOfDarkness