problems with having css and images show on website. Will return in 15 hours
Merge branch 'master' of https://github.com/stuycs-softdev/proj1-7