Merge pull request #52 from ospreys-2014/user_branch

User branch
Genre as cards..still need to format the look
Merge pull request #53 from ospreys-2014/front_end

Genre as cards..still need to format the look