Only collide if not talking
Merge branch 'master' of https://github.com/samphippen/fully-shaven-yak