Ignore node_modules/*
Quick Add: Parse dates and times automatically instead of manually entering them.
Merge feature: Quick Add: Parse dates and times automatically instead of manually entering them.

Conflicts:
	src/browser_action.js