Resolved conflicts.

app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java

@@ -113,6 +113,7 @@ public class MainActivity extends AppCompatActivity implements CameraFragment.On
         FragmentManager man = getFragmentManager();
         ProfileFragment frag = (ProfileFragment) man.findFragmentById(R.id.content);
         FragmentTransaction transaction = man.beginTransaction();
+        frag.progressDialog.dismiss();
         transaction.detach(frag)
                 .attach(frag)
                 .commit();

app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/ProfileFragment.java

@@ -42,7 +42,8 @@ public class ProfileFragment extends Fragment implements View.OnClickListener {
     protected TextView profileName;
     protected ImageView profilePicture;
     protected FirebaseUser user;
-    private ProgressDialog progressDialog;
+    ProgressDialog progressDialog;
+
 
     /// Required empty public constructor ///