Removing conflicts

Didn't realise git put the conflicts into the file, removing them.
Also, now have my first monster displaying and almost-animated. Having
a problem with clearing the canvas.