working
Merge branch 'master' of github.com:cosmicc/galaxymediatools

Conflicts:
	transtv
working
Merge branch 'master' of github.com:cosmicc/galaxymediatools

Conflicts:
	README.md
working