created user#show routes, all tests pass
merge conflict resolved (clean up assignment_controller tests)

Conflicts:
	app/views/assignment/show.html.erb
	spec/controllers/assignment_controller_spec.rb
Merge pull request #15 from whoisglover/user_routes

Looks great!! Nice Work.