Conflicted files - still working on css
Merge branch 'maxl' of https://github.com/mporam/TaskManagr into maxl