finishing merge
Merge pull request #9 from Babakadam121/james_merge_babak_ui

James merge babak ui
fixed stuff for heroku
fixed some old merge conflict i missed
created functionality to give shift
working process