Merge branch 'master' of http://www.cs.uoregon.edu/Classes/14S/cis410parallel/repo
working/finishing labs6/7
working/finishing labs6/7