Conditionals Ex. 3
Merge remote-tracking branch 'origin/tnichols'