Removed old files
Updated files
Merge branch 'master' of https://github.com/grBro/taskmanager