Rename des exceptions
conflit
Merge branch 'master' of https://github.com/mael65/climso-auto.git

Conflicts:
	Sources/image.cpp
Merge branch 'master' of https://github.com/mael65/climso-auto.git

Conflicts:
	.gitignore