Task 2 and 3 done
sort button removed
merge conflicts resolved
Merge branch 'master' of github.com:agilejs/nyanCat