bouhahah
Merge pull request #5 from CarrDavidDC/dev_david2

bouhahah
Merge pull request #6 from CarrDavidDC/dev_david

commit
Merge branch 'master' of https://github.com/CarrDavidDC/tpPromenades

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/com/example/tppromenades/R$id.class
	bin/resources.ap_
	bin/tpPromenades.apk
	gen/com/example/tppromenades/R.java