Making progress.
Master conflicts fixed.
Master conflicts fixed.
Heroku names here.
Merge pull request #21 from hdavidzhu/teacherpost

Teacherpost