task 2 step 1 (no cross check)
Merge branch 'master' of https://github.com/hellloy/ram

Conflicts:
	RamXML.v12.suo
	RamXML/bin/RamXML.dll
	RamXML/bin/RamXML.pdb
	RamXML/obj/Debug/RamXML.dll
	RamXML/obj/Debug/RamXML.pdb