changes bookmarks to pull one and save to bookmarks
Merge remote-tracking branch 'origin/parseBookmarks' into development

Conflicts:
	lib/githubQuery.js
	lib/main.js
Made getLocalBookmarks(), qnd pull bookmarks.json