readme
Merge branch 'master' of https://github.com/Alendri/pplan

Conflicts:
	README.md