Merge branch 'master' of https://github.com/JeLe/project

Conflicts:
	Line_Runner.pyc
	project.py
bon git hub me dit conflit mais moi je vois pas...
ba je lui dit prout!!!!