tests
Merge branch 'master' of github.com:icco/natnatnat
Merge branch 'master' of github.com:icco/natnatnat

Conflicts:
	Makefile
Merge branch 'master' of github.com:icco/natnatnat