testing
readme
Merge branch 'master' of github.com:gangleri/filetran

Conflicts:
	package.json