ugly still but loads home
whatever
Merging branches
Merge branch 'master' of https://github.com/TeamHTTP418/FinalProject