hhhhh
Merge branch 'Camera' of https://github.com/earthhhh/E-Shopping into Camera

Conflicts:
	ClassDiagram[V1.8].vpp