no message
no message
Merge branch 'master' of https://github.com/ericdonze/Project_BFH into develop

Conflicts:
	SDL2.cbp
	entity.cpp
	entity.h
	obj/Debug/entity.o
Merge branch 'master' of https://github.com/ericdonze/Project_BFH