Lab 2014-7-18_13:14
Merge remote-tracking branch 'origin/master'

Conflicts:
	C&C++/test/test.cpp