i did stuff too oooooooo
Merge remote-tracking branch 'origin/master'

Conflicts:
	UltraBrawl/UltraBrawl/SpriteManager.cs
	UltraBrawl/UltraBrawlContent/UltraBrawlContent.contentproj