5
Merge branch 'master' of github.com:awake558/q

Conflicts:
	test.c
a
Merge branch 'a'

Conflicts:
	test.c
b
c
c

Conflicts:
	test.c
h
add u.c
add u.c
Merge branch 'Debug' into Int

Conflicts:
	test.c