first SUCCESSFULLY get stuff to work on homepage
Merge branch 'master' of https://github.com/kaoriprice/Group3