efforts from in class 3/25/12
Merge pull request #16 from zbtirrell/in-class

efforts from in class 3/25/12