conflict merged
Merge pull request #31 from dontmitch/condition_front_end

Add better sentence building to conditional page