fin du tp
Merge branch 'master' of https://github.com/tszym/imgopencv

Conflicts:
	include/tp2.hpp