first working version
Merge branch 'master' of github.com:xjodoin/tsstore

Conflicts:
	.gitignore