make some change
Merge branch 'master' of https://github.com/bluesea16/trypull-p3

Conflicts:
	CMake2.gitignore