halfway to sticky footer
Merge branch 'master' of github.com:lisajwells/wdi_project_three
adding html file instead of haml
big changes to the server
gitignore test
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
Merge branch 'master' of github.com:lisajwells/wdi_project_three
removing extra html
added api logic to routes
Merge branch 'master' of github.com:lisajwells/wdi_project_three
Changed index to erb and updated JS
Merge branch 'master' of github.com:lisajwells/wdi_project_three
better div matching
small server update
Merge branch 'master' of github.com:lisajwells/wdi_project_three
more server updates
solving merge conflict