a
Merge branch 'master' of https://github.com/Dracir/semicolon

Conflicts:
	semicolon.userprefs