removing weird album art pictures of david copperfield
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
#58 updated SSBbackground.mp3
committing changes to pull ethan's dev
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
removed depricated code
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
Merge branch 'dev' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
pushing changes made while trying to fix draw, discard and display issue
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev
Fixed  #64 we were forgetting to take out some old code. That only took 2 hours or so