Some cosmetic changes + arbitrary output pyramid size..
Merge commit 'bf94f2593a775e79a06d7ef776115ba3f649c4cb'

Conflicts:
	hello.cpp
Merge remote-tracking branch 'upstream/master' into vojt