Initial comment
Added rspec,jquery,test mode
Merge branch 'master' of heroku.com:completeror-production

Conflicts:
	.rspec
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config.ru
	config/application.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	spec/spec_helper.rb
modify changes first merge
modify libv8 version