main update
merge stuff
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++/muparsertest.o
	0.3/c++/nattable.o