Life corrigé, vive les codeurs lents
Merge branch 'master' of github.com:jmcomets/EUSDAB

Conflicts:
	include/HPLife.h
	include/infiniteLife.h