mixup (and fun)#18

chris234567 wants to merge 2 commits intoohm-softa:masterohm-softa/ohm-softa.github.io:masterfrom

chris234567:masterchris234567/ohm-softa.github.io:masterCopy head branch name to clipboard