version 1
Merge branch 'master' of ssh://git@github.com/Spymannn/ProjetAndroid.git
version 2
Merge branch 'master' of ssh://git@github.com/Spymannn/ProjetAndroid.git

Conflicts:
	project.properties