First Commit
Merge branch 'master' of github.com:jerome-quere/WhenPlusPlus

Conflicts:
	README.md