Brand new life
example1 commit
bababa commit 1
bababa commit2
Merge branch 'bababa' into example1
tsret
Merge branch 'master' into bababa

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