debugging
Merge branch 'debugging'

Conflicts:
	app/assets/javascripts/outings.js