fixed: forgot to solve some merge conflicts in @65fc31569a7df56beecdf6139280605c82388fc4
	modified:   dvdtrackrip.py
changend behaviour on output in dvdtrackrip, fixed path joining, removed maybe unessary output file check
	modified:   dvdtrackrip.py