fixed done button for tasks
remove dsstore
git ignore conflict