Nothing
Merge branch 'master' of https://github.com/Henry23/RecordsManagementSystem.git

Conflicts:
	RecordsManagementSystem/RecordsManagementSystem.pro.user
Updating
Merge branch 'master' of https://github.com/Henry23/RecordsManagementSystem.git

Conflicts:
	RecordsManagementSystem/RecordsManagementSystem.pro.user
	build-RecordsManagementSystem-Desktop_Qt_5_1_0_MinGW_32bit-Debug/debug/RecordsManagementSystem.exe