Removed table by mistake.  Put table back in
Fixed conflicts in users/index.html.erb