oO
Merge branch 'master' of https://github.com/dima888/SE2

Conflicts:
	Debug/SE2.exe
	Debug/SE2.ilk
	Debug/SE2.pdb
	SE2.sdf
	SE2.suo
	SE2/Debug/CL.read.1.tlog
	SE2/Debug/CL.write.1.tlog
	SE2/Debug/DataShipping.obj
	SE2/Debug/InputOutput.obj
	SE2/Debug/SE2.log
	SE2/Debug/SystemIntergration.obj
	SE2/Debug/link.read.1.tlog
	SE2/Debug/vc100.idb
	SE2/Debug/vc100.pdb
	SE2/InputOutput.cpp
	ipch/se2-61845c25/se2-80d57b56.ipch