com simu
Merge branch 'master' of github.com:utcoupe/coupe14

Conflicts:
	ia/constantes.py