add sinatra
add api
yo, here's the actual api stuff
Merge branch 'v3' into v3-api
require the other stuff so the routes actually EXIST
add rack-test gem
dump dis
Merge branch 'v3' into v3-api
add yajl
add api tests
wrong App
run tests from script/test instead of rake - faster, and comprehensive
kill data before running the test. Huh?

Shouldn't ActiveSupport::TestCase already be doing this? Might need to
add DatabaseCleaner in
require yajl
no more namespacing
do these tests now
return a hash from song
test for now playing when there's actually something playing
update endpoints
Merge branch 'v3' into v3-api

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/song.rb
	config/routes.rb
	test/models/song_test.rb
	test/test_helper.rb