Lots of things
Merge branch 'master' of github.com:SolangeTeixeiraOliveira/projpart3

Conflicts:
	src/sqlFunctions/SQLFunctionsBorrower.java