Fixed a bug
Merge remote-tracking branch 'origin/master' into Sprint3-Demo
Merge remote-tracking branch 'origin/master' into Sprint3-Demo
Fixed
Merge remote-tracking branch 'origin/Sprint3-Demo' into stickyBug
Merge branch 'stickyBug'
Merge remote-tracking branch 'origin/master' into ShieldBall