Somewhat synced?

Things are getting weird.
Merge branch 'master' of https://github.com/Dracolord1208/G-Shift

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