fixed encoding error
Merge branch 'master' of https://github.com/kunshao/EECS498