ignore changes

ignore changes
Merge branch 'master'

Conflicts:
	.gitignore
	sazerac.sav