Merge branch 'master' into seanKeane
Tabbed pane working

Got the tabbed pane working so you can select between songs, albums,
artists
Added song object to be used for song values
Track List updated
Merge branch 'seanKeane' into tommieNavin
added songs for testing and folders
Created method to read files from folder
Merge pull request #4 from tnavin/tommieNavin

Tommie navin
added updates to the list method
 seans changes
 seans changes
merge seans branch
Merging tommies branch to Sean
Songs in the res folder can now be updated and selected
Added images display and artist name display
Merge branch 'seanKeane' of https://github.com/seank90/Mp3-Player into seanKeane
manual merge
refactored code to display and removed Display class
refactored code to display and removed Display class
Merge pull request #5 from tnavin/tommieNavin

Tommie "The Tank Engine" navin