genres
merged
gernes more
Merge branch 'master' of https://github.com/nicorpp/lamixtape into genres
merged sc
genres done, except white space