Added some optimizations
Merge branch 'master' of https://github.com/TeamAntitarra/TeamProject-RPGGame
Added some optimizations