implemented xTrace
implemented xtrace
Merge branch 'master' of https://github.com/qt31415926/group10a1

Conflicts:
	src/global.h