.
Merge branch 'master' of https://github.com/flanr/Prototype

Conflicts:
	bin/Prototype_x86d.pdb
	buildB/Prototype/Debug/CL.read.1.tlog
	buildB/Prototype/Debug/CL.write.1.tlog
	buildB/Prototype/Debug/Prototype.lastbuildstate
	buildB/Prototype/Debug/Prototype.log
	buildB/Prototype/Debug/cl.command.1.tlog
	buildB/Prototype/Debug/link.command.1.tlog
	buildB/Prototype/Debug/link.read.1.tlog
	buildB/Prototype/Debug/link.write.1.tlog
	buildB/Prototype/Debug/main.obj
	buildB/Prototype/Debug/vc110.idb
	buildB/Prototype/Debug/vc110.pdb