непонятно что
Merge branch 'master' of https://github.com/zhelih/MedicineDB

Conflicts:
	MedicineDb-build-Desktop_Qt_5_0_1_MinGW_32bit-______/Makefile.Debug
	MedicineDb-build-Desktop_Qt_5_0_1_MinGW_32bit-______/Makefile.Release