ll
Merge branch 'master' of https://github.com/24/lynSubtitle

Conflicts:
	.gitignore