Update from submoduel of test_project2
Merge branch 'master' of github.com:fishstix/test_project3

Conflicts:
	file3