Added Python novice lesson 04-cond and some related code examples
Merge branch 'gh-pages' of https://github.com/hpcarcher/2014-12-03-edinburgh into gh-pages