Merge remote-tracking branch 'heroku/master'
Merge branch 'master' of https://github.com/iamsolipsism/PandaTutor