Dor 2014-11-11_0:38
Merge remote-tracking branch 'origin/master'

Conflicts:
	C&C++/06_Data Structures & Algorithms/Ch2/Tunel/tunel.cpp