initial commit
updating gitignore
Merge branch 'master' of https://github.com/kjford/Connectomics

Conflicts:
	.gitignore