not sure what I did
Merged changes
Fixed index view to show first_name and last_name