player comparison
Merge branch 'child1'

Conflicts:
	project.cpp