commit from feng's home laptop
Merge branch 'master' of https://github.com/zhanpengf/Training

Conflicts:
	training2/library.cpp
	training2/training2.cpp