Primary diagram
Merge branch 'master' of https://github.com/TheAtomicGnome/Fimbul

Conflicts:
	Fimbul/Fimbul.sdf
	Fimbul/Fimbul.v11.suo
	Fimbul/Fimbul/Release/CL.read.1.tlog
	Fimbul/Fimbul/Release/CL.write.1.tlog
	Fimbul/Fimbul/Release/Fimbul.log
	Fimbul/Fimbul/Release/Main.obj
	Fimbul/Fimbul/Release/cl.command.1.tlog
	Fimbul/Fimbul/Release/link.command.1.tlog
	Fimbul/Fimbul/Release/link.read.1.tlog
	Fimbul/Fimbul/Release/link.write.1.tlog
	Fimbul/Fimbul/Release/vc110.pdb
	Fimbul/Release/Fimbul.exe
	Fimbul/Release/Fimbul.pdb
Merge branch 'master' of https://github.com/TheAtomicGnome/Fimbul

Conflicts:
	Fimbul/Fimbul.sdf
	Fimbul/Fimbul.v11.suo