Merge branch 'master' of github.com:sorenmat/goeventstore

Conflicts:
	.gitignore