lnkb
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git

Conflicts:
	StreaMe.pro.user
Commit fusion et display video

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git
Commit displayVideo Rom
Conflicts:
	StreaMe.pro.user
	controller.cpp
	controller.h
	mainwindow.cpp
	mainwindow.h

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>