BLAHAHJFLKJ"
Merge branch 'thomas-and-kirin' of github.com:deatheragetr/playlister-rb into thomas-and-kirin
Finished except EC