Change read me
Merge branch 'master' of https://github.com/joInMontreal/obox-test

Conflicts:
	README.md