Merge branch 'master' of github.com:averello/xfig

Conflicts:
	.gitignore