soln lab1
Merge branch 'lab1' of github.com:michelleoj/6.858-lab-2014 into lab1