;
Merge branch 'master' of https://github.com/Dracolord1208/G-Shift

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