...
Merge branch 'master' of github.com:hleclerc/StelaIr

Conflicts:
	tests/test.met