Updated gitignore
Merge branch 'master' of https://github.com/hltcoe/concrete
Merge branch 'master' of https://github.com/hltcoe/concrete

Conflicts:
	.gitignore
Removed Relation set and added in labeled string attribute and edge label attribute
Merge pull request #4 from dkolas/master

Additions to protobuf spec for Temporal Facts
revert back to old protobuf definitions
Merge pull request #5 from hltcoe/protob-revert

revert back to old protobuf definitions
Add name file generation to TACKB ingest
Merge pull request #6 from hltcoe/name-txt-file

Add name file generation to TACKB ingest
Use available protoc plugin on public maven repo
Merge pull request #7 from hltcoe/new-protoc-plugin

Use available protoc plugin on public maven repo
Move scala out of project. Move up pom.xml versions to prepare for release
Kill test based on local data
Merge pull request #8 from hltcoe/p1.0.7_j1.0.5

kill scala for time being; revert back to "old" protobufs
update README with new instructions
Merge branch 'master' of https://github.com/hltcoe/concrete

Conflicts:
	concrete-protobufs/src/main/proto/concrete.proto
Added two file reading methods to FileUtil
Merge branch 'master' of github.com:JackSullivan/concrete into jack-master
Tweak pom.xml files
Prepare new releases