merge newest into browser
fix merge conflicts
Merge pull request #108 from 121watts/browser-functiionality

Borrower functionality