Completed if, else, ternary
Merge branch 'master' of https://github.com/mlle-juju/ios-exercises