initial commits.
Merge branch 'master' of https://github.com/shimar/tasks

Conflicts:
	.gitignore