Refactored searchResults into SearchService. Added dependencies for SearchService. Added player.play(song) in search.html on click.
Refactored searchResults into SearchService. Added dependencies for SearchService. Added player.play(song) in search.html on click.
Added TODO issues comments
Merge branch 'searchRefactor' into dev
Added addToQueue button on search.html
Switched play onto own button and added addToQueue button for each song instead of a central one on the page
Merge pull request #34 from nickescallon/dev

Fixed issues #24 and #18
Refactored searchResults into SearchService. Added dependencies for SearchService. Added player.play(song) in search.html on click.
Added TODO issues comments
Merge branch 'searchRefactor' into dev
Merge pull request #36 from malucky/dev

Refactored searchResults into SearchService. Added dependencies for Sear...
Basic player logic
Merge from player
Changed player.play to the new play() function
Merge branch 'dev' into addToQueue

Conflicts:
	public/views/queue.html
Merge pull request #37 from deini/dev

Fixed Issue #21
Added css for addToQueue and play buttons.
implemented FrameController test
minor comments
Merge branch 'tests' into dev