Merge branch 'master' of github.com:ourcd/ckt_2014newyear
Merge branch 'master' of github.com:ourcd/ckt_2014newyear