Merged and fixed conflict

The conflict was simple, wondering how to make  this not happen in the future, for example I always just want to choose the develop branch's version

Conflicts:
	Shooter_Project_Windows/Shooter/Shooter/Shooter/Game1.cs