nbbo2
Merge branch 'master' of https://github.com/paradigm4/quotes

Conflicts:
	nbbo2
nbbo2