all of the debug logging
Merge branch 'master' of github.com:icco/sadnat.com
bundle update
bundle update
active record
Merge branch 'master' of github.com:icco/sadnat.com

Conflicts:
	Gemfile.lock