fix2
changes
gemfile
changes
changes
fix
path fix
hope this is the last one
Merge commit 'e13b81c1cc57c36e1b2f9e11e712aa0df234fa7d'

Conflicts:
	app.rb