broken file. need to merge Ryan's fix
merging
gerge branch 'jlebrun-class5' of https://github.com/ryansobol/sea-c17-ruby

Conflicts:
	class5/2_build_a_shuffled_playlist_extended.rb
exercise 2 is working
exercise 2 is working. deleted backup
trying to pull

Merge branch 'master' of https://github.com/jlebrun/sea-c17-ruby