Fixed
Merge branch 'master' of https://github.com/Morphei/course_work

Conflicts:
	course_work.pro.user