Changing methods ...
Changing methods ...
Merge branch 'master' of https://github.com/JosafatV/FIleSystem

Conflicts:
	src/registerManager/registermanager.cpp