idon'tknowwhatthisis
Merge branch 'master' of https://github.com/EC327Set/SetGame

Conflicts:
	QT/EC_327_Final.pro.user
	QT/mainwindow.cpp