Push to heroku
Merge branch 'current'

Updates master to most recent branch. All errors fixed.