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

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	project.properties
	res/layout/activity_inscription.xml
	res/layout/activity_main.xml
	res/menu/inscription.xml
	res/menu/main.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values-w820dp/dimens.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/testunprojet/Inscription.java
	src/com/example/testunprojet/MainActivity.java