wanted to see if Linux/VM would work; no need to merge
Merge branch 'master' of https://github.com/GucciTheCarpenter/GADS9-NYC-Spring2014 into rstancut_lab01a
lab2 re Python Classes