css changes
Merge branch 'master' of github.com:biveeco/freecine

Conflicts:
	assets/css/style.css