add password, password_confirmation to rake fake task
fix fake users task
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