recommit

Making sure we have everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Sprites.meta