Merge pull request #32 from ospreys-2014/user_branch

fixed user controller
Setting up video background
Merge pull request #33 from ospreys-2014/categories

Setting up video background
Update README.md
add unit test for valid email address and only allow soundcloud urls for soundcloud_profile
starting unit testing on user associations
unit testing of genre model with associations
rebasing
troubleshooting review tests
in progress: revising associations
Merge pull request #34 from ospreys-2014/model_migration

Model migration
formating and update of artist display
styling changes to user show
Merge pull request #36 from ospreys-2014/artist_profile

Artist profile