commit design
Merge branch 'master' of https://github.com/coutcout/ListeTache

Conflicts:
	gen/com/example/listetache/R.java