removed extra file
adjust views and controllers
Merge branch 'master' of github.com:Alyssa098/task_manager into andrea
Merge branch 'master' of github.com:Alyssa098/task_manager
Merge branch 'master' into andrea