First
Merge branch 'master' of github.com:HeinzHinek/AxiStore

Conflicts:
	.gitignore