Encore Truc :)
Merge branch 'master' of https://github.com/yoannlepetit/MYMorse.git

Conflicts:
	bin/MYMorse.apk
	bin/classes.dex
	bin/resources.ap_
	gen/net/enib/mymorse/R.java