stuff
merge conflicts
did some styling
Merge branch 'master' of github.com:reed-seroussi/twitter-picker