from class,
Merge branch 'master' of https://github.com/bitdreamer/CS355