3rd change
Merge branch 'master' of https://github.com/realityox/test

Conflicts:
	test.cpp