???reset and change and commit
Merge branch 'master' of https://github.com/dyslove123/2014_11_26

Conflicts:
	11.txt