Merge branch 'master' of https://github.com/ilmente/Plainbook

Conflicts:
	README.md