Test
Merge branch 'master' of https://github.com/mSavary/Ad-Hoc

Conflicts:
	README.md