Anim Jolis
Couleurs random
commit after merge
commit before merge
Merge branch 'master' of github.com:Herzucco/BeautifulInfinitTextualExperiment into HEAD

Conflicts:
	Project/AndroidManifest.xml
	Project/res/values/strings.xml
	Project/src/com/stratos/beautifulinfinittextualexperiment/ListActivity.java