merge w original version + changes for cos126
Merge branch 'master' of github.com:cemc/cscircles-wp-content