Added SoundComponent.cs
Implementing an idea for the weapons system.
Implement weapon collisions
Merge branch 'Weapons' of github.com:dkellycollins/DungeonCrawler into Weapons
debug.cache commit for merging
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
in class fixes
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/Systems/MovementSystem.cs
Merge branch 'master' into Weapons

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
	DungeonCrawler/DungeonCrawlerContent/DungeonCrawlerContent.contentproj.user
refactored weapon system and weapon factory.
More updates to the quest log
Added cases for the SkillProjectile to the associated systems.  Also added a skill trigger to the input for testing purposes
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj
	DungeonCrawler/DungeonCrawler/DungeonCrawlerGame.cs
	DungeonCrawler/DungeonCrawler/Systems/GarbagemanSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/InputSystem.cs
Refactored the skillProjectileFactory, skillAoEFactory, nd SkillDeployableFactory into one SkillEntityFactory.

Still just creates the skill projectile, aoe, and deployable component. Functionallity unchanged
added aoe and deployable skills to the collision and garbage system.  currently the aoe and deployable do not disappear,  this is on purpose.  They will have different triggers for when to dissappear.
changes 1.0
Merge branch 'HEAD' of https://github.com/zombiepaladin/DungeonCrawler.git

Conflicts:
	DungeonCrawler/DungeonCrawler/CharacterSelection/CharSelectPreview.cs
	DungeonCrawler/DungeonCrawler/CharacterSelection/CharacterSelectionScreen.cs
	DungeonCrawler/DungeonCrawler/CharacterSelection/ContinueNewGameScreen.cs
	DungeonCrawler/DungeonCrawler/Components/EnemyComponent.cs
	DungeonCrawler/DungeonCrawler/Components/GameComponent.cs
	DungeonCrawler/DungeonCrawler/ControllerBindings.cs
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
	DungeonCrawler/DungeonCrawler/DungeonCrawlerGame.cs
	DungeonCrawler/DungeonCrawler/Entities/AggregateFactory.cs
	DungeonCrawler/DungeonCrawler/Entities/EnemyFactory.cs
	DungeonCrawler/DungeonCrawler/Entities/WeaponFactory.cs
	DungeonCrawler/DungeonCrawler/KeyboardBindings.cs
	DungeonCrawler/DungeonCrawler/LevelManager.cs
	DungeonCrawler/DungeonCrawler/Systems/CollisionSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/EnemyAISystem.cs
	DungeonCrawler/DungeonCrawler/Systems/GarbagemanSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/InputSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/MovementSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/RenderingSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/RoomChangingSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/WeaponSystem.cs
	DungeonCrawler/DungeonCrawlerContent/DungeonCrawlerContent.contentproj
	DungeonCrawler/DungeonCrawlerContent/Spritesheets/Thumbs.db
	DungeonCrawler/DungeonCrawlerContent/Tilemaps/TestDungeon3.tmx
Update changes
Merge branch 'HEAD' of https://github.com/zombiepaladin/DungeonCrawler.git

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.orig
	DungeonCrawler/DungeonCrawler/DungeonCrawlerGame.cs
	DungeonCrawler/DungeonCrawler/DungeonCrawlerGame.cs.orig
	DungeonCrawler/DungeonCrawler/Entities/SkillEntityFactory.cs
	DungeonCrawler/DungeonCrawler/Systems/CollisionSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/GarbagemanSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/GarbagemanSystem.cs.orig
	DungeonCrawler/DungeonCrawler/Systems/InputSystem.cs
	DungeonCrawler/DungeonCrawler/Systems/InputSystem.cs.orig
Almost got weapons working.