refactor using FACTORIES
Merge branch 'master' of https://github.com/h4w5/tunr

Conflicts:
	Gemfile.lock
	spec/factories/artist.rb
	spec/factories/song.rb
	spec/factories/user.rb
	spec/features/user_creates_playlist.rb
fixed conflicts