added comment to test kaplanoahs access to heroku
fixed merge conflict in stylesheet from earlier heroku test