canh1 commit
Merge branch 'master' of https://github.com/canhhs91/canhproj

Conflicts:
	canh2.txt