Configurator added
Merge branch 'master' of github.com:toumilov/course_work

Conflicts:
	protocol/CW/CW.pro.user