Update for new action
Merge branch 'master' of https://github.com/runkmc/flix

Conflicts:
	config/routes.rb
Create new movie form and actions