tagline/critique changes

[jayfo]

Your pull won't merge because it's based on an old master and there's a conflict somewhere.

You need to update your master:

git checkout master
git pull uwcse440 master
git push

Then rebase your branch, and resolve any conflicts while you're at it:

git checkout Tagline
git rebase -i master
git push -f

That'll update this pull request.