Changed asb hello.rb
Merge branch 'add_spree_bootstrap'

Conflicts:
	test-git/hello.rb
Modified hello.rb
Merge branch 'add_spree_bootstrap'

Conflicts:
	test-git/hello.rb