printed hello
updated main a bit
fixed main.cpp
Merge remote-tracking branch 'origin'

Conflicts:
	src/main.cpp