seems to work.
it's happening
Merge branch 'test'

Conflicts:
	app.rb