fix signup feature test
Merge pull request #47 from ospreys-2014/model_migration

Model migration
artist can now select multiple genres they can assign themselves
dried up some things
hide category options to just artists
hide genre selection for artists
fix merge conflicts
Merge branch 'user_branch'
add jquery to signup and login forms
fix redirect for login and signup forms
layout fixes
Merge pull request #49 from ospreys-2014/front_end

layout fixes
Merge pull request #50 from ospreys-2014/user_branch

fix redirect for login and signup forms
merging
Merge pull request #51 from ospreys-2014/front_end

merging
fix conflicts
Merge branch 'master' of https://github.com/ospreys-2014/Kendrick
gemfile modified
fixed jquery on signup and login clicks
fixed routes