.
fixing heroku bug
merging changes