added Dina's stuff
Merge pull request #12 from stuycs-ml7-projects/biggs

Working Copy for 1/20/13
Merge branch 'master' into steven
updated methods