attempting to resolve heroku conflict 1
attempting to resolve heroku conflict 2
some public view changes