initial commit
init
enhancement1
Merge branch 'master' of https://github.com/eforth/ef_rottenpotatoes

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/images/rails.png
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/application_controller.rb
	app/controllers/movies_controller.rb
	app/helpers/application_helper.rb
	app/helpers/movies_helper.rb
	app/models/movie.rb
	app/views/layouts/application.html.haml
	app/views/movies/edit.html.haml
	app/views/movies/index.html.haml
	app/views/movies/new.html.haml
	app/views/movies/show.html.haml
	autotest/discover.rb
	config.ru
	config/application.rb
	config/boot.rb
	config/cucumber.yml
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20111119180638_create_movies.rb
	db/seeds.rb
	lib/tasks/cucumber.rake
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/images/rails.png
	public/index.html
	public/javascripts/application.js
	public/robots.txt
	public/stylesheets/general.css