fixed user#show test to accurately reflect changes in logic

The user#show method now returns a hash that includes the student and
their submissions.  This new structure broke a controller test, this commit fixes that.
Merge branch 'master' into user_routes
Merge pull request #34 from whoisglover/user_routes

User routes