update and resolve conflict

Author: khangich

.gitignore

@@ -1,76 +1,39 @@
-ddf-runtime
-.*.swp
-.cache
-
-### Maven
-# These files should be generated by, e.g., bin/make-poms.sh
-spark_adatao/pom.xml
-pa/pom.xml
-contrib/pom.xml
-
-### Eclipse
-# These files should be generated by, e.g., bin/make-*-eclipse.sh
-.project
-.classpath
-.settings
-
-### R
-# History files
-.Rhistory
-
-# Example code in package build process
-*-Ex.R
-
-### Java
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-#*.jar
-#*.war
-#*.ear
-
-### Scala
 *.class
+*.swp
 *.log
-
-# sbt specific
-.cache/
-.history/
-.lib/
-dist/*
 target/
+.idea
+.idea_modules
+.DS_Store
+.part-00000.crc
+.cache
+.settings/
+metastore_db/
+wordcount-input.txt
+# The project pom.xml's are generated by "bin/make-poms.sh"
+*/pom.xml
+# The root pom.xml is manually maintained
+!./pom.xml
+# Eclipse .classpath and .project are generated by "bin/make-eclipse-projects.sh"
+*/.classpath
+*/.project
+# lib_managed/ is generated by "sbt compile"
 lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-
-# Scala-IDE specific
-.scala_dependencies
-.worksheet
-*.dat
-.idea/*
-.idea_modules/*
-*.iml
-
-### Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-
-# C extensions
-*.so
-
-
-#core/metastore_db/*
-
-inst/java/
-*~
-*metastore_db/
+nohup.out
+
+#spark/conf/local
+
+core/target
+spark/target
+example/target
+project/target
+core/ddf-runtime
+examples/target/streams
+core/target/streams
+project/target/streams
+spark/target/streams
+R/package/inst/java
+# R stuffs
 .Rproj.user
-#Rserve files
-pa/rlibs/Rserve/*
-pa/conf/local/hive-site.xml
-spark/conf/local/hive-site.xml
+.Rhistory
+.RData

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014, Adatao, Inc.
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,3 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

README.md

@@ -1,3 +1,9 @@
+DDF
+===
+
+Distributed DataFrame: Productivity = Power x Simplicity
+For Big Data Scientists & Engineers
+
 # DDF - Distributed DataFrame 
 
 DDF aims to make Big Data easy yet powerful, by bringing together