Merge pull request #68 from ospreys-2014/model_migration

Model migration
fix merge conflicts
fix merge conflicts
fix merge conflictS
fix css
fix merge conflicts
Merge pull request #69 from ospreys-2014/user_branch

User branch
partly implemented ajax for ratings. commented out to resume development later
add jquery library
correct the user_id in the hidden input so that user will be recorded while rating an artist
enclose in span tags to accommodate future jquery to update the rating number upon ajax callback