Add genre
Movies done
Merge branch 'genre'

Conflicts:
	app/views/users/new.html.erb