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

Conflicts:
	SDL2.depend
	SDL2.layout
	bin/Debug/SDL2.exe
	obj/Debug/CApp_OnEvent.o
	obj/Debug/CApp_OnLoop.o
update
Merge branch 'master' of https://github.com/ericdonze/Project_BFH

Conflicts:
	SDL2.layout
	bin/Debug/SDL2.exe
	obj/Debug/CApp_OnEvent.o
	obj/Debug/CApp_OnLoop.o
	obj/Debug/capp.o
	obj/Debug/entity.o
Merge branch 'master' of https://github.com/ericdonze/Project_BFH
update
Merge branch 'master' of https://github.com/ericdonze/Project_BFH

Conflicts:
	CApp_OnLoop.cpp
	bin/Debug/SDL2.exe
	entity.cpp
	entity.h
	obj/Debug/CApp_OnLoop.o
	obj/Debug/entity.o