styling changes for progress fragment, styling changes for history fragment, hooking up history fragment to parse data
fixing merge