initial commit - uploading and messaging working separately
Merge branch 'master' of https://github.com/lgargantini/tfi

Conflicts:
	.gitignore