hopefully fixes #22
added flames taunt
Merge remote-tracking branch 'upstream/master'