mmmmmmmmm
Merge branch 'master' of https://github.com/GamesAndStuff/GameLib

Conflicts:
	GameLibrary/Entities/Components/Render/Sprite.cs