fixed some bugs
Merge branch 'master' of https://github.com/i3ick/Winter-Slash.git
Merge branch 'master' of https://github.com/i3ick/Winter-Slash.git
nm