updated to newest version
Merge branch 'master' of https://github.com/cs561/projects