Merge branch 'master' of https://github.com/masami1981/OP-lab3

Conflicts:
	OP-lab3.pro
Merge branch 'master' of https://github.com/masami1981/OP-lab3