Reset, pauseish
Merge branch 'master' of https://github.com/kangareuben/nanoshot

Conflicts:
	Nanoshot/Assets/Scripts/PlayerController.cs