updated for heroku playback
Merge branch 'master' of https://github.com/br3annalynn/Hackbright_Project