Lovely looking index
t/MERGE_HEADgit comit
q\q/qMerge branch 'master' of https://github.com/elizahyde/fandangr

Conflicts:
	app/views/movies/index.html.erb
let's push those pretty pages again