Hafiz
Merge branch 'master' of https://github.com/missuperior/careers

Conflicts:
	dao/hrDAO.php