asdfasdf
Merge branch 'master' of https://github.com/gmacintyre/GuitarTabWriter

Conflicts:
	.gitignore