tweaks
Merge branch 'master' of https://github.com/crobinson33/OSHO

Conflicts:
	Player.cs
Mergefix
Fixing deltaTime draws
Sprite updates