git ignore
Merge branch 'master' of github.com:robb-brown/pyMinc

Conflicts:
	.gitignore