unpinned finished
Merge branch 'master' of http://github.com/mberberet/CS564-Phase3