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

Conflicts:
	config/environments/development.rb
configured assets for heroku
using unicorn as webserver on heroku and dev
Merge branch 'master' into eventbrite-api

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/home/index.html.erb