A brand new story
Merge branch 'SimpleBranch1'

Conflicts:
	HelloWorld/grails-app/views/index.gsp