little detail
Merge branch 'master' of https://github.com/meckyr/WarpJam

Conflicts:
	WarpJam/WarpJam/bin/Windows Phone/Debug/WarpJam.dll
	WarpJam/WarpJam/bin/Windows Phone/Debug/WarpJam.pdb
	WarpJam/WarpJam/bin/Windows Phone/Debug/WarpJam.xap
	WarpJam/WarpJam/obj/Windows Phone/Debug/WarpJam.csproj.FileListAbsolute.txt
	WarpJam/WarpJam/obj/Windows Phone/Debug/WarpJam.dll
	WarpJam/WarpJam/obj/Windows Phone/Debug/WarpJam.pdb
	WarpJam/WarpJam/obj/Windows Phone/Debug/XapCacheFile.xml