hello
Merge branch 'master' of github.com:delepo/miser

Conflicts:
	.gitignore
g
Merge branch 'master' of github.com:delepo/miser

Conflicts:
	.gitignore