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
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine

Conflicts:
	DreamStateMachine/DreamStateMachine.csproj
	DreamStateMachine/obj/x86/Debug/DreamStateMachine.csproj.FileListAbsolute.txt