Killing things when we shoot them
Merge remote-tracking branch 'origin/master'