First commit
added gitignore
Merge branch 'master' of https://github.com/markob/dataproc

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/markob/dataproc

Conflicts:
	.gitignore