ghg
Merge branch 'master' of https://github.com/jonathanbugs/anselmi

Conflicts:
	.gitignore