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 pull request #17 from marklc44/master

add fake user password/password_confirmation + email randomizing
Merge branch 'master' into feature_branch_matt
fixed img bug
Merge pull request #18 from rasbabbo/master

fixed img bug
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
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
s3 working
s3 working
Merge pull request #21 from rasbabbo/master

adding login and sessions
please
Merge pull request #22 from joemeers82/master

rocknroll
merging joes stuff
Merge branch 'master' of https://github.com/mjminc/project2
images showing