ajout settings
Merge branch 'master' of https://github.com/Zaurak/NEAT.git

Conflicts:
	editeur/src/com/example/neat/EditActivity.java
Merge branch 'master' of https://github.com/Zaurak/NEAT.git

Conflicts:
	editeur/src/com/example/neat/EditorActivity.java
Merge branch 'master' of https://github.com/Zaurak/NEAT
Dernière révision
Please enter the commit message for your changes. Lines starting