Test commit
Merge branch 'master' of https://github.com/AySz88/vep-training

Conflicts:
	HardwareParameters.m