dico
Merge branch 'master' of https://github.com/stampil/Motus

Conflicts:
	js/dictionnaire.js