Merge pull request #2 from JonoEPD/master

fixed
Merge pull request #3 from JonoEPD/master

added cross product stuff for second step
updated copy..?
Merge branch 'master' of https://github.com/apaw/165B-Project3
added 2nd mapping/reduce