nic
nic
Merge branch 'master' of https://github.com/BiomedEKG/ecg_holter

Conflicts:
	.gitignore
	Agh/DADM/DADM.sdf
	Agh/DADM/DADM.v11.suo
	Agh/DADM/Ekg/Debug/CL.read.1.tlog
	Agh/DADM/Ekg/Debug/CL.write.1.tlog
	Agh/DADM/Ekg/Debug/Ekg.Build.CppClean.log
	Agh/DADM/Ekg/Debug/Ekg.lastbuildstate
	Agh/DADM/Ekg/Debug/Ekg.log
	Agh/DADM/Ekg/Debug/cl.command.1.tlog
	Agh/DADM/Ekg/Debug/custombuild.command.1.tlog
	Agh/DADM/Ekg/Debug/custombuild.read.1.tlog
	Agh/DADM/Ekg/Debug/custombuild.write.1.tlog
	Agh/DADM/Ekg/Debug/ekg.obj
	Agh/DADM/Ekg/Debug/link.command.1.tlog
	Agh/DADM/Ekg/Debug/link.read.1.tlog
	Agh/DADM/Ekg/Debug/link.write.1.tlog
	Agh/DADM/Ekg/Debug/main.obj
	Agh/DADM/Ekg/Debug/moc_ekg.obj
	Agh/DADM/Ekg/Debug/qrc_ekg.obj
	Agh/DADM/Ekg/Debug/vc110.pdb
	Agh/DADM/Ekg/Ekg.vcxproj.user
	Agh/DADM/Win32/Debug/Ekg.exe
	Agh/DADM/Win32/Debug/Ekg.ilk
	Agh/DADM/Win32/Debug/Ekg.pdb
Merge branch 'master' of https://github.com/BiomedEKG/ecg_holter
Sprint_1.ods