Merge branch 'master' of https://github.com/mit-probabilistic-computing-project/BayesDB

jbaxter · jbaxter · commit 7fb3d8a530b7 · 2013-10-03T02:52:29.000Z
Conflicts:
	LICENSE
	README.md
diff --git a/LICENSE b/LICENSE
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-tabular-predDB
+BayesDB
 ==============
 
 The [wiki](http://probcomp.csail.mit.edu/preddb/index.php?title=BayesDB) is the primary source of documentation.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-tabular-predDB`
	`1`	`+BayesDB`
`2`	`2`	`==============`
`3`	`3`
`4`	`4`	`The [wiki](http://probcomp.csail.mit.edu/preddb/index.php?title=BayesDB) is the primary source of documentation.`