condition one complete, condition two incomplete
Merge branch 'master' of github.com:darchcruise/choose_your_own_adventure
logic partially complete