State @home
Merge settings
Merge branch 'master' of https://github.com/alehandrof/sublime-settings

Conflicts:
	Distraction Free.sublime-settings
	Preferences.sublime-settings