added new task
wrong merge
Local Commit
Fixed conflict
Full gitignore
Made project