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

Conflicts:
	bin/Debug/SDL2.exe
	obj/Debug/Button.o
	obj/Debug/CApp_OnCleanp.o
	obj/Debug/CApp_OnEvent.o
	obj/Debug/CApp_OnInit.o
	obj/Debug/CApp_OnLoop.o
	obj/Debug/CApp_OnRender.o
	obj/Debug/capp.o
	obj/Debug/entity.o
supp
Merge branch 'master' of https://github.com/ericdonze/Project_BFH