Small changes in makeup
Merge branch 'master' of https://github.com/cockerel/StudyOfSubthresholdPerception

Conflicts:

	StudyOfSubthresholdPerception/StudyOfSubthresholdPerception/FormSetEditor.Designer.cs