bug fixors
Merge branch 'master' of https://github.com/salivalevil/TasKing.git