Merge branch 'dev' of github.com:stuycs-softdev/proj2-pd7-07--twitter into dev
removed ~ file
Removed extra file telling to switch to dev
Removed extra switch to dev file
Merge pull request #2 from stuycs-softdev/dev

Dev
Merge pull request #3 from stuycs-softdev/chris

Removed extra switch to dev file
Basic api functionality
Now displays api data
Merge pull request #4 from stuycs-softdev/chris

Chris
Merge branch 'master' of github.com:stuycs-softdev/proj2-pd7-07--twitter into jeremy
basic highscore functionality