package update
Merge branch 'master' of https://github.com/brishin/notes

Conflicts:
	packages/.gitignore
	smart.json
	smart.lock