fixed footer
Merge branch 'master' of https://github.com/wnajar/finalproject

Conflicts:
	js/main.js