refactored user controller fixed image - img_url bug
Merge remote-tracking branch 'origin/master' into feature_branch_matt

Conflicts:
	thejar/app/controllers/users_controller.rb
Merge branch 'master' into feature_branch_matt
reconciled login problems and routes
Merge branch 'master' of https://github.com/mjminc/project2 into feature_branch_matt

Conflicts:
	thejar/app/views/users/edit.html.erb
pulled changes
 sessions and show
rectified routes
Merge pull request #21 from rasbabbo/master

adding login and sessions