pulling stuff
merge conflict resolved
JLabel in addBorrower fixed