merging
Merge branch 'master' of https://github.com/dannygoodman210/SLogoTeam1
fixed show trail bug
Merge branch 'master' of https://github.com/dannygoodman210/SLogoTeam1