Commit so I can sync (I don't understand github)
Merge branch 'master' of https://github.com/jemah/enchord

Conflicts:
	lines.txt
	parser.js