all controllers and views fixed
Merge branch 'master' of github.com:Derikulous/office_hours