Merge branch 'master' of https://github.com/rlemaitre/dailymeetic

Conflicts:
	README.md
updated README