commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.py
Merge branch 'master' of https://github.com/annthoniez/Project_build1

Conflicts:
	project.py