나도 장난으로 커밋
Merge branch 'master' of https://github.com/CSED233Project/Projectzzang

Conflicts:
	main.cpp
	src.pro.user