fixed small memory leak
resolving conflicts
Merge branch 'master' of https://github.com/Largaroth/Drunken_Ninja