Added failing tests
Added failing test for moved movie file
Added working failing tests for subdirectories
Fixed broken logic. Subdirectories now sort properly
Merge branch 'subdirectories'

Conflicts:
	features/steps/sort.py