moved some stuff around
Merge branch 'master' of github.com:JOakley77/ffmpegtool

Conflicts:
	composer.json