Baseline2 v0.1

Hello noahhsmith,

Let's try another merge on /test before doing it on /knowledge/prototype

For the changes, see README.md