created blank tree.py file
this will contain the code for the tree datastructure
Merge branch 'dev' of github.com:stuycs-softdev/proj2-pd7-07--twitter into dev
merging
Can display individual tweets
Merge branch 'chris' of github.com:stuycs-softdev/proj2-pd7-07--twitter into chris
Lists first 10 tweets from search
Created separateHashtags()
added some stuff to home.html
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd7-07--twitter into jeremy
Merge branch 'dev' of github.com:stuycs-softdev/proj2-pd7-07--twitter into dev
basic highscore functionality
Merge branch 'jeremy' into dev
"Added basic highscore functionality"
now lists tweets s.t. there are 10 hashtags you could click on. if impossible, it doesn't
crash, but merely lists less tweets.
separating html files
Project flow: initial attempts at home(), game(), highscore(), and leaderboard() functions. Needs compatibility with corresponding .html files
almost finished templates
project flow coded in; home, game, highscore, leaderboard functions
Merge branch 'dev' into jeremy
"test api.py with updated .html files"
modified templates slightly to have the right form methods. debugged api.py slightly.
removed bad copies of templates
tree asdf