Merge remote-tracking branch 'upstream/master'
Add support for the short-circuit logical operators && and ||.
Merge pull request #29 from kmillikin/short-circuit

Short circuit