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
Merge pull request #18 from rasbabbo/master

fixed img bug
comment out dup messages routes
add beginnings of new messages
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
fix document ready for all js files
fix doc ready for calendar
Merge pull request #19 from marklc44/master

add new message form partial, fix doc ready issue with all js files
pulled changes
 sessions and show
rectified routes