fixed abilities
new fireballs
Merge remote-tracking branch 'upstream/master'