funcionalidad de twitter
Merge branch 'master' of github.com:rodri328/P4_rottenpotatoes

Conflicts:
	app/models/movie.rb
	db/development.sqlite3
	tmp/pids/server.pid
	vendor/bundle/ruby/1.9.1/gems/ffi-1.1.5/ext/ffi_c/libffi-i686-linux/.libs/libffi_convenience.a
	vendor/bundle/ruby/1.9.1/gems/ffi-1.1.5/ext/ffi_c/libffi-i686-linux/config.log