Merge pull request #1 from arianagiorgi/master

Merge
Merge pull request #2 from arianagiorgi/master

something wrong with output
Merge pull request #3 from arianagiorgi/master

code w/ freebase jars
Merge pull request #1 from hylbyj/master

Merge pull request #1 from arianagiorgi/master