addtesting
newmaster
hotadded
Merge branch 'testing'

Conflicts:
	hello.cpp