stashing
Merge branch 'master' of github.com:pdilyard/securehome

Conflicts:
	securehome.sublime-workspace