Updates
Merge branch 'master' of https://github.com/CuriousDays/Software-Settings

Conflicts:
	project-settings/curiousedit-desk.sublime-workspace