-
-

Merge branch 'master' of https://github.com/valcu/bib

Conflicts:
	inst/UI/ui.R
-