bug fix on image display
Merge branch 'seanKeane' into tommieNavin
images and names displaying with artist and title
 merge of sean and tommie branch
merge of master and tommie
Merge pull request #6 from tnavin/tommieNavin

Tommie navin
songs now working with buttons
Merge pull request #9 from johnJudgeGriff/johnGriffin

John griffin
Merge branch 'tommieNavin' into seanKeane

Conflicts:
	Mp3 player/src/code/MainWindow.java
	Mp3 player/src/code/listOfTracks.java
Final Touches