work notes
Merge branch 'master' of github.com:erezschatz/dentro

Conflicts:
	development.opml