fixed overlapping problem
Merge branch 'master' of https://github.com/jackl92/SENG403-Group6