Just a few lines I fixed or added because I'd accidentally ommitted them. Now pulling with your Barrier class and whatever else you'd added :) So excited!
Merge branch 'master' of https://github.com/pjwilcox/cs160-winter13-A2
It compiles and runs, but you'll notice that the output is off within 1 decimal point. Do you have any ideas? I'm going to keep working, but here's the code. --Parry