tag and task style
merge conflicts
Merge branch 'master' of github.com:Alyssa098/task_manager