Merge pull request #54 from ospreys-2014/user_branch

User branch
merging
Merge pull request #55 from ospreys-2014/front_end

merging
fix merge conflicts
Fixing grid for genres
Merge pull request #57 from ospreys-2014/front_end

Fixing grid for genres
fix signin test
add signin test for incorrect info
add test for post signup to see if user can see genres
add test for I am an artist checkbox
DRY
add validation if artist doesn't choose a genre
fix repeating headers on signup and signin
fix redirect after invalid info on signup and login