Good
Merge branch 'pr/2' of https://github.com/mark9856/Test into pr/2

Conflicts:
	test1.cpp