add some data
Merge branch 'master' of https://github.com/jefferyhe/flix

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/images/.keep
	app/assets/images/ironman.jpg
	app/assets/images/placeholder.png
	app/assets/images/spiderman.jpg
	app/assets/images/superman.jpg
	app/assets/javascripts/application.js
	app/assets/javascripts/movies.js.coffee
	app/assets/stylesheets/_colors.scss
	app/assets/stylesheets/application.css
	app/assets/stylesheets/layout.css.scss
	app/assets/stylesheets/movies.css.scss
	app/controllers/application_controller.rb
	app/controllers/concerns/.keep
	app/controllers/movies_controller.rb
	app/helpers/application_helper.rb
	app/helpers/movies_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/concerns/.keep
	app/models/movie.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_siderbar.html.erb
	app/views/layouts/application.html.erb
	app/views/movies/_form.html.erb
	app/views/movies/edit.html.erb
	app/views/movies/index.html.erb
	app/views/movies/new.html.erb
	app/views/movies/show.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	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/date_formats.rb
	config/initializers/filter_parameter_logging.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/20140617152330_create_movies.rb
	db/migrate/20140618040012_add_fields_to_movies.rb
	db/migrate/20140709193552_add_more_fileds_to_movies.rb
	db/schema.rb
	lib/assets/.keep
	lib/tasks/.keep
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	test/controllers/.keep
	test/controllers/movies_controller_test.rb
	test/fixtures/.keep
	test/fixtures/movies.yml
	test/helpers/.keep
	test/helpers/movies_helper_test.rb
	test/integration/.keep
	test/mailers/.keep
	test/models/.keep
	test/models/movie_test.rb
	test/test_helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/stylesheets/.keep