before pull
merge conflicts
Merge branch 'master' of https://github.com/danmartelly/SugarRush
merge  conflcits
merge conflicts
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Merge branch 'master' of https://github.com/danmartelly/SugarRush
overlap instead of collide w/ enemies
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Merge branch 'master' of https://github.com/danmartelly/SugarRush
Merge branch 'master' of https://github.com/danmartelly/SugarRush
fixed some merge errors
added new sprites with attack and freeze animation frames
fixing merge conflicts