bug fixed
Merge branch 'master' of github.com:onebyone/489project
wtf