add a cookie to store ratings selection and sorting argument
Merge branch 'master' of github.com:Shinkenjoe/rails-intro
a darn amend

Conflicts:
	app/views/movies/index.html.haml