"Changed files."
More merge conflicts fixed??

Conflicts:
	lib/dvd.rb