add conditional to proposed
add conditional to proposed talk
Merge branch 'master' into rspec
memoization
Merge branch 'master' into rspec
update upcoming talk spec