a
Merge branch 'master' of https://github.com/Forest-sample/Smart.git

Conflicts:
	Smart_lot1/bin/classes/fr/umlv/lastproject/smart/CenterOverlay.class
Merge branch 'master' of https://github.com/Forest-sample/Smart.git

Conflicts:
	Smart_lot1/bin/classes/fr/umlv/lastproject/smart/CenterOverlay.class
Merge branch 'master' of https://github.com/Forest-sample/Smart.git
a
Merge branch 'master' of https://github.com/Forest-sample/Smart.git
a
Merge branch 'master' of https://github.com/Forest-sample/Smart.git
m
Merge branch 'master' of https://github.com/Forest-sample/Smart.git

Conflicts:
	Smart_lot1/bin/classes/fr/umlv/lastproject/smart/CenterOverlay.class