still working on footer
working on feature section of homepage
cleaning up some views
resolved conflicts