first commit
Merge branch 'master' of github.com:barbaracassani/tstic

Conflicts:
	README.md