Merge branch 'master' of github.com:abdurrehmanamjad/dss_prod
screen log deleted
pulling from heroku
pulling from live server
added map
pushing code on live server
merge