halfway to sticky footer
Merge branch 'master' of github.com:lisajwells/wdi_project_three
adding html file instead of haml
Merge branch 'master' of github.com:lisajwells/wdi_project_three

Conflicts:
	freeday_app/db/connection.rb
Merge branch 'master' of github.com:lisajwells/wdi_project_three