'first commit'
Merge branch 'master' of github.com:oops1898/tess

Conflicts:
	.gitignore