no message
no message
no message
no message
no message
no message
Merge branch 'develop' of https://github.com/comingw/Algorithm2 into develop

Conflicts:
	develop1
	feature1