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

Conflicts:
	src/sqlFunctions/SQLFunctions.java
Merge branch 'master' of https://github.com/SolangeTeixeiraOliveira/projpart3