Implement mark as done
Implement delete task
Merge branch 'master' of github.com:ricardorojass/fix-conflict

Conflicts:
	index.html