joining/updating two project versions
Merge branch 'master' of https://github.com/oconshien/cls_upper