update 3
Merge branch 'master' of https://github.com/olivierlemasle/massive-archer

Conflicts:
	README.md