footer Done

footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css