fixed footer
fixed footer

Conflicts:
	unit1_projects/stylesheets/index.css