va
changed life and calling kill_bots
Merge remote-tracking branch 'upstream/master'