change puma server
clean code up, add search bar
consolidate edit/show view
merge conflict