First commit
Merge branch 'master' of github.com:tiagogomes/DocStore

Conflicts:
	.gitignore