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

Conflicts:
	project.py
no i want my way !