cmsimple add
Merge branch 'master' of github.com:kmollee/2013fall