footer fix
Merge branch 'master' of https://github.com/johndilworth/drapercreekside

Conflicts:
	css/nav.css