commit
Merge branch 'master' of https://github.com/Kedens/HW2

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