testing
Merge branch 'master' of https://github.com/Loquats/Guitar

Conflicts:
	README.md
blah commit