gitignore
Merge branch 'growing' into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:bcipolli/CorpusCallosum into develop