Merge branch 'dev'

Conflicts:
	local.py

README.md

@@ -3,3 +3,10 @@
 #about
 
 A command line evernote for linux (not finished yet).
+
+
+## Config developer and noteStore url
+
+  - If you use evernote, please visit https://www.evernote.com/api/DeveloperToken.action to generate a developer token and noteStore url.
+  - If you use yinxiang, please visit https://app.yinxiang.com/api/DeveloperToken.action instead.
+  - After you got the developer token and noteStore url, please replace the settings in config.py.sample, and rename it to config.py.