removed logins from resources
updated views
fixed merge error routes
removed extra file
Changed login
Merge branch 'master' of github.com:Alyssa098/task_manager
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
Filled out controllers and views for tags and projects
style updates
merge conflicts
fixed a bug in views/projects/index
made changes to show projects and projects edit/delete
Updated tasks show view
Merge branch 'master' into alyssa
style updates
style
merge conflicts