- trying to resolve conflicts
Merge branch 'master' of github.com:raylim/CLC-modules