fixed a bug
Merge branch 'master' of https://github.com/MattLagueras/Odyssey.git
fixed collison bits and working on mage