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

Conflicts:
	0.3/natcore.pyc
	0.3/natparser.pyc
	0.3/natplot.pyc
	0.3/nattable.pyc