Unwanted modification PLEASE DISCARD THIS COMMIT
AndroidManifest.xml: conflict resolved
.gitignore: modified to match my configuration (Julien)