further layout changes
Merge branch 'master' into kevin

Conflicts:
	css/style.css
	index.html
movie table changes
Merge branch 'kevin'