layout ver 1.0
Merge branch 'master' of https://github.com/jspenc45/CMC.git