update
Merge branch 'master' of https://github.com/ericdonze/Project_BFH

Conflicts:
	entity.cpp