Fixed footer height and redid footer markup
Merge branch 'pr/2'

Conflicts:
	_layouts/default.html
	css/main.css