Git ignore.
Merge branch 'master' of https://github.com/sardyntax/datadive

Conflicts:
	datadive-generator/datadive-generator.iml
	datadive-runner/datadive-runner.iml