try commit
Merge branch 'master' of https://github.com/daidong/drafts

Conflicts:
	.DS_Store