...
Merge branch 'master' of https://github.com/Stonaldo/memory_tasks

Conflicts:
	.project