removing passwords
Merge branch 'master' of github.com:FrenchBully/musicbox

Conflicts:
	app/controllers/playlists_controller.rb
	app/controllers/tracks_controller.rb