[ADD] hello
Merge branch 'master' of https://github.com/mittermichal/about-git

Conflicts:
	app.rb