pulling
reorganized gridView
added toolbar items
reorganized view
pushing updates
Fixed merge conflicts