Changes to .gitignore
Merge branch 'development' of github.com:revbayes/code into development

Conflicts:
	.gitignore