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

Conflicts:
	0.3/c++/Nat-O-Mi
	0.3/c++/main.o
	0.3/c++/makefile
	0.3/c++/natUtils.o
	0.3/c++/natconpute.o
	0.3/c++/natomi.o
	0.3/c++/natparser.o
	0.3/c++/natunits.o
Merge branch 'master' of https://github.com/poulenque/Nat-O-Mi

Conflicts:
	0.3/c++/Nat-O-Mi
	0.3/c++/main.o
	0.3/c++/natconpute.o
	0.3/c++/natparser.o
	0.3/c++/natunits.o