disable activerecord
styling changes
Merge branch 'master' of https://github.com/sjdug/sjdug-web

Conflicts:
	config/environments/development.rb