Attempt at fixing merge conflict

docs/building-with-maven.md

docs/index.md

docs/quick-start.md

docs/streaming-programming-guide.md

ec2/spark_ec2.py

examples/pom.xml

examples/src/main/scala/spark/examples/LocalKMeans.scala

...es/src/main/scala/spark/examples/MultiBroadcastTest.scala

...c/main/scala/spark/examples/SimpleSkewedGroupByTest.scala

...les/src/main/scala/spark/examples/SkewedGroupByTest.scala

...n/scala/spark/streaming/examples/TwitterAlgebirdCMS.scala

pom.xml

project/build.properties

project/plugins.sbt

python/examples/transitive_closure.py

python/pyspark/rdd.py

repl-bin/pom.xml

repl/pom.xml

repl/src/main/scala/spark/repl/SparkILoop.scala

run