sal fixed stylesheet
Merge branch 'styling_fixes'

Conflicts:
	css/styles.css
	index.html