Ignore Sublime Text files
Merge remote-tracking branch 'origin/master' into css-cleanup/sass

Conflicts:
	.gitignore