Merge branch 'develop' of https://github.com/mitjmcc/DreamStateMachine into develop

Conflicts:
	.gitignore
Added Tundra texture/world!
Re-added sound with new damage sound.
Merge branch 'master' into develop
Merge pull request #19 from mitjmcc/develop

Excellent work!
Changed the SoundManager to a singleton
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine into develop
Work towards animation overhall.
Fine tuning enemy stats and behaviors.
ongoing animation changes
Debug box now passed in IDrawable interface for debugging (duh). Actors comparisons now done by id rather than equality. Working hitbox detection for custom animations.
Merge branch 'animationFix'

Conflicts:
	DreamStateMachine/ActorController.cs
	DreamStateMachine/ActorManager.cs
	DreamStateMachine/Behaviors/Aggravated.cs
	DreamStateMachine/Content/Worlds.xml
	DreamStateMachine/WorldManager.cs
Added Prop and Prop Manager class for generic non-physics affected items (like drops or items).
File organization and work on weapons
File restructure plus work on weapons.
Merge pull request #21 from brohand/master

Added Prop and Prop Manager class for generic non-physics affected items...
Changed file structure, added weapons, itemmanager, and handled animations in new way. DamageInfo now takes a list of rectangles rather than a single rectangle.
Merge branch 'weapons'
Merging weapons branch
Adds else clause to draw default tile outside of the map.
Merge pull request #22 from othornycroft/master

Adds else clause to draw default tile outside of the map.