change to 16
Merge branch 'master' of https://github.com/motherjones/brackets

Conflicts:
	style.css