Make
ii
i
Merge branch 'master' of https://github.com/divideyourself/dbpedia

Conflicts:
	Makefile