Update
Merge branch 'master' of https://github.com/wangkekekexili/CS6250

Conflicts:
	Makefile