edit TODO : backlog ...
Merge branch 'master' of https://github.com/kelto/software-project

Conflicts:
	README.md