makefile
Merge branch 'master' of https://github.com/xknxkn/xkntest

Conflicts:
	hustgroup2/Makefile