Background stuff
Merge branch 'master' of https://github.com/deathByLiche/Koding-Kings

Conflicts:

	FinalProject/TriviaMaze/TriviaMaze/obj/Debug/TriviaMaze.csproj.FileListAbsolute.txt