working on sticky footer
fixed footer
Merge branch 'testing'

Conflicts:
	css/style.css