Attempt at fixing merge conflict

bagel/pom.xml

bagel/src/main/scala/spark/bagel/Bagel.scala

bin/spark-daemon.sh

bin/spark-daemons.sh

bin/start-master.sh

bin/start-slave.sh

bin/start-slaves.sh

bin/stop-master.sh

bin/stop-slaves.sh

conf/spark-env.sh.template

core/pom.xml

core/src/main/scala/spark/RDD.scala

core/src/main/scala/spark/SequenceFileRDDFunctions.scala

core/src/main/scala/spark/rdd/CheckpointRDD.scala

core/src/main/scala/spark/rdd/CoGroupedRDD.scala

core/src/main/scala/spark/rdd/ShuffledRDD.scala

core/src/main/scala/spark/rdd/SubtractedRDD.scala

core/src/main/scala/spark/rdd/ZippedRDD.scala

...rc/main/scala/spark/storage/BlockManagerMasterActor.scala

docs/_config.yml