travail de dimanche
essai 3
Merge branch 'master' of https://github.com/scauglog/sma_mogre

Conflicts:
	bin/Debug/ogre.cfg