r35

- fixed merge problems (lesson learnt from that)
- fixed faulty instruction from the note
- changed enemy HP
Magic Edition

This version will be the src release the Magic Edition binary will be
using.
- changes position of Console.Clear() in the Spellbook
- adds new debug command: givemagic