SYNTAX
exclamation mark added
Merge branch 'branch2'

Conflicts:
	hello_world.rb