added health , ammo , slowdown render
collisionevents for player
fixed merge

Conflicts:
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_View.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/PlayerInfo.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/PlayerInfo.h