branch change
Merge branch 'branch1'

Conflicts:
	lib/hola_gem.rb