Clarified roadmap
Merge branch 'master' of https://github.com/mdamien/boxes

Conflicts:
	roadmap.md