Resolve Merge conflict.
Resolve merge conflict.
Merge branch 'master' of https://github.com/Rawfling/GraphReader