Merge branch 'master' of https://github.com/dvlchd3/flexget
Merge branch 'master' of https://github.com/dvlchd3/flexget
Add movies download from trakt.
Merge branch 'master' of https://github.com/dvlchd3/flexget
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.yml