Added failing tests
Added failing tests
Added working tests for multiple_movies
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
Merge branch 'master' into remove_movie_folder

Conflicts:
	features/sort.feature
Added properly failing tests