middle of shopping list changes - pushing to sameer
reverting some code in user/edit.html.erb - bad commit
merge in dev_branch