cause git ugghh
Apparently I modified literally everything
Merge branch 'master' of https://github.com/SStilson/CHAP2
made changes to home page
Merge branch 'master' of https://github.com/SStilson/CHAP2
Merge branch 'master' of https://github.com/SStilson/CHAP2
updated about page
pulled in preparation to push about page changes