Add today line to hello
modify the day line in hello
Merge branch 'master' into develop

Conflicts:
	hello.rb