Store Songs In Array to Be Played
Merge branch 'master' of https://github.com/smashingboxes/smashing_jukebox

Conflicts:
	lib/player.rb