Gitignore
Merge branch 'master' of https://github.com/alexandresablayrolles/pimpandroidapplication

Conflicts:
	bin/Projet_INF422.apk
	bin/classes.dex
	bin/resources.ap_