Slimmer version - no popups
update - merge conflict solutions
Revert "Rename _not_CNAME to CNAME"

This reverts commit 033de4d38ab44a5a60b61bca328baebba5d47834.
Merge branch 'master' of https://github.com/jarvklo/jarvklo.github.io.git