Added pickup, added scaling on pickup, broke my life, I am destroyed, added fixed shit
Merge branch 'master' of https://github.com/ChiefCashier/2D-GraphicsEngine

Conflicts:
	CancerMotor/CancerGame/Enemy.cpp
	CancerMotor/CancerGame/Entity.h
	CancerMotor/CancerGame/Game.cpp
	CancerMotor/CancerGame/Player.cpp
	CancerMotor/CancerGame/Projectile.cpp
Merge branch 'master' of https://github.com/ChiefCashier/2D-GraphicsEngine

Conflicts:
	CancerMotor/CancerGame/CancerGame.vcxproj
	CancerMotor/CancerGame/CancerGame.vcxproj.filters
	CancerMotor/CancerGame/Game.cpp
	CancerMotor/CancerGame/Game.h
	CancerMotor/CancerGame/Player.cpp
	CancerMotor/CancerGame/Projectile.cpp
	CancerMotor/CancerMotor/CMShape.cpp