- Initial Commit
- Merged conflict in gitignore
- Added eclipse specific files to git ignore
Merge branch 'master' of github.com:mallocator/Elasticsearch-Hadoop-River

Conflicts:
	.gitignore