oko
Merge branch 'Near-Final' of https://github.com/Dracolord1208/G-Shift into Near-Final

Conflicts:
	G-Shift/G-Shift/Game1.cs