booo
Merge branch 'master' of https://github.com/will421/RICM3_Projet_CPS_2012_2013
finit presque

Conflicts:
	include/util.h
	src/ppm.c~
	src/traitement_image.c~
	src/util.c
	src/util.c~