update guides
update guides
Merge branch 'master' of https://github.com/fmay/cc-js-intro-2-conditional