stuff
Merge branch 'new2'

Conflicts:
	hello.cpp