...
Merge branch 'master' of https://github.com/CasasoftCH/casasync

Conflicts:
	.DS_Store