first commit
Merge https://github.com/Cecko/freebase