5th test
Merge branch 'master' of github.com:chiupeter/test_git
fix conlict
Conflicts:
	main.cpp