index on rails: 4f39727 Changing image.
untracked files on rails: 4f39727 Changing image.
On rails: WIP on rails before reverting 4f3972
Merge branch 'grand' into rails

Conflicts:
	app/assets/images/cinema-start.png
	app/assets/images/cinema.jpg
	app/assets/images/cinema7.gif