ds store commit
Merge branch 'master' of https://github.com/arunakulat/syncwithlocal

Conflicts:
	.DS_Store