Added a comment.
Removed comment
Merge remote-tracking branch 'upstream/master'
Added some base code for testing controller
I changed a thing!
Pull input out of game.cs and adds controller support.
Fixed merge conflicts.
Merge branch 'master' of https://github.com/jpfeltracco/DreamStateMachine into jpfeltracco-master

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/game.cs
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Added ignores
Added a sound class, sound manager class, music xml, sound xml and several test sounds I had.
I implemented a game over sound.
So far the only sounds with ids are:
1 - Death sound
2 - Pickup sound
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine into SoundClass

Conflicts:
	DreamStateMachine/ActorManager.cs
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/game.cs
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Sound Class

Added sound class, sound manager, some sound xmls, and sound files.

Currently there are two sounds in the xml:
1 - Death
2 - Pickup
Merge pull request #14 from jpfeltracco/master

Updated Input Class / Controller Support
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine into develop

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/game.cs
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt
Cleaning up
Merge pull request #16 from mitjmcc/master

Added Sound Class - Minus the conflicts
Cloned actors sight vector not getting set
Refactoring Damage Handling
Added event handling for world changes to helper classes, inputComand now handles actor uses, actors now handle their own damage, skeletons no longer spawn, outside of the map on world changes, world changes no occur seamlessly, refactoring various helper classes, game now handles player spawn, player is now an actor class that can be assigned attributes