aaa
aaaaaaaa:wq
Merge branch 'master' of github.com:bgmc/nog

Conflicts:
	test.c
Merge branch 'master' of github.com:bgmc/nog