merge
Merge branch 'master' of https://github.com/huayyang/CSCI580_FinalProject

Conflicts:
	CS580_Final_Project/CS580_Final_Project/global.h
	CS580_Final_Project/CS580_Final_Project/main.cpp