Continuing to deploy on heroku
working master
fixed conflicts, workind master