MARIE : Interface 1ere Version
Marie : Trie & interface
Merge branch 'master' of github.com:mnoiret/ToutDoux

Conflicts:
	app/src/main/java/tout/doux/app/MainActivity.java
	app/src/main/java/tout/doux/app/model/StorageHelper.java