finnish
ok
Merge branch 'master' of https://github.com/poulenque/Nat-O-Mi

Conflicts:
	test/data/test.cc