merge conflict
Merge branch 'master' of https://github.com/sinahab/KnowledgeGraph
Merge branch 'master' of https://github.com/sinahab/KnowledgeGraph
merge conflicts
Merge branch 'master' of https://github.com/sinahab/KnowledgeGraph
add and delete functionality complete