gitignore
Merge branch 'master' of https://github.com/littlebaka/ProjetAndroid.git

Conflicts:
	PuyDuFou/.gitignore