merge
Merge branch 'create-playlist' of https://github.com/PatGW/crowd into create-playlist
pre merge commit
merge commit
Redesign forms for playlist creation
Search results rerender ajax request on second search
Added songs to current playlist
Merge branch 'add-songs-to-playlist' of digital_learner_gh:PatGW/crowd into add-songs-to-playlist
Rdio play button workiing
Json response
Json response
Merge branch 'master' into rdio

Conflicts:
	app/models/search.rb
Moving towards being able to delete song - can do in DB but not visually (yet)
Resolved merge conflict in searches/_index.html.erb
resolved merge conflicts with homepage branch
do_search returns an simple songs object
Merge branch 'master' of github.com:PatGW/crowd
Bootstrap search button
Bootstrap buttons
Merge to master resolving conflicts