yea

Signed-off-by: Nathaniel Nelson <nelson.nleroy@gmail.com>
Merge branch 'master' of https://github.com/GamesAndStuff/GameLib

Conflicts:
	GameLibrary/Dependencies/Entities/EntitySystem.cs
	GameLibrary/Helpers/Drawing/AssetCreator.cs
	GameLibrary/Helpers/Drawing/Camera.cs
	GameLibrary/Helpers/Drawing/LineBatch.cs
	GameLibrary/Helpers/Drawing/PrimitiveBatch.cs
	GameLibrary/Helpers/Drawing/ScreenHelper.cs
	GameLibrary/Helpers/Drawing/SpriteSheet.cs