no message
Merge branch 'master' of https://github.com/chebz/Algorithms

Conflicts:
	Algorithms/Algorithms.sdf
	Algorithms/Algorithms.v12.suo
	Algorithms/OJ/Debug/OJ.log
	Algorithms/OJ/Debug/OJ.tlog/CL.read.1.tlog
	Algorithms/OJ/Debug/Source.obj
	Algorithms/OJ/Debug/vc120.idb
	Algorithms/OJ/Debug/vc120.pdb
	Algorithms/OJ/OJ.vcxproj
	Algorithms/OJ/OJ.vcxproj.filters
	Algorithms/OJ/Source.cpp