s
Merge branch 'master' of https://github.com/oozlegit/lilac-for-brackets

Conflicts:
	package.json