Change configuration
Merge branch 'master' of github.com:HughChadwick/sheetMusic

Conflicts:
	.gitignore
Resolve merge conflict