+
Merge branch 'master' of https://github.com/binking338/hduacm.git

Conflicts:
	1042.c