Problem on a merge
Merge branch 'master' of https://github.com/djouv/ludum

Conflicts:
	res/imageTest/Thumbs.db