Initial commit
Changed view
Move sqlite gem into development group and add pg production gem
changed my name
Merge branch 'master' of heroku.com:berkeley169

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	config.ru
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/inflections.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/seeds.rb
	public/500.html
skeleton
added unicorn
added unicorn.rb