ddd
Merge branch 'master' of https://github.com/bgmc/nog

Conflicts:
	test.c