working on branch
testing for make branch
Merge branch 'john_test'

Conflicts:
	test_john.txt
Merge branch 'master' of https://github.com/xbsoft/demo