teste de pau loko
Merge branch 'master' of github.com:anacaet/music

Conflicts:
	test/functional/songs_controller_test.rb