Changed file names and made addTask
merge