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

Conflicts:
	Smart_lot1/bin/classes/fr/umlv/lastproject/smart/GPS.class
	Smart_lot1/src/fr/umlv/lastproject/smart/GPS.java
cd