haha resources
Merge branch 'master' of https://github.com/uc-dipp/uc-dipp.github.io