frimin
Merge branch 'master' of https://github.com/frimin/EquipmentManagementSystem

Conflicts:
	src/db_layer.cpp