close to done
pick friends working
rm accidental files
All functionality working
removed a lot of junk
deleted files
heroku changes
Merge branch 'heroku'
removed email