Moved magic stuff to Hero_Charms
Merge remote-tracking branch 'origin/master'