Updated master instead of my branch to push to heroku because I'm fucking retarded