Vetement et fille
gitignore
Merge branch 'master' of https://github.com/daniellevy/DressMe
prout
Conflicts:
	bin/classes/com/dressme/dressme/Image.class
	bin/classes/com/dressme/dressme/MainActivity.class
	bin/classes/com/dressme/dressme/Manteau.class
	bin/classes/com/dressme/dressme/Pull.class
	bin/classes/com/dressme/dressme/Top.class
	bin/classes/com/dressme/dressme/Vetement.class