Changed lots of things. Site works now.
Merge branch 'master' of github.com:whtouche/MovieNight

Conflicts:
	app/views/layouts/full.html.erb