testMerge branch 'master' of https://github.com/smaestri/livresentreamis