fixed buffer overflow issue
added new enemy type
Merge branch 'mergeBranch'