putting this here in lieu of a stash
ignore some temporary files/folder
more ignoring
Merge branch 'release/v0.6.5'

Conflicts:
	.gitignore