Hello message
Hello message
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/views/default/say_hello.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Hello message