Committing changes to resetPassword
"Made changes to resetPassword"Merge branch 'master' of https://github.com/OscarFalcon/Airport_FX

Conflicts:
	src/application/ManagerEmployeeController.java