fire texture
suppression makefile
Merge branch 'master' of https://github.com/arktic/Particule
suppression conflit
 jn
Merge branch 'master' of https://github.com/arktic/Particule

Conflicts:
	Core/include/app.h