More index changes
Merge branch 'master' of github.com:lisajwells/wdi_project_three
fixed css I changed earlier
Fixed merge conflicts
html updates
html commits
some additional changes
Merge branch 'master' of github.com:lisajwells/wdi_project_three

Conflicts:
	freeday_app/views/index.erb