Fixed UML Diagram

OlympusServices/.idea/misc.xml

@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

OlympusServices/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/User.java

@@ -1,5 +1,6 @@
 package com.uottawa.olympus.olympusservices;
 
+
 public class User extends UserType {
 
     User(String username, String password, String firstname, String lastname){

OlympusServices/build.gradle

@@ -7,16 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.android.tools.build:gradle:3.2.0'
-=======
-<<<<<<< HEAD
-        classpath 'com.android.tools.build:gradle:3.2.0'
-=======
-        classpath 'com.android.tools.build:gradle:3.1.4'
-
->>>>>>> 0e3ca9a99ca712d5307384360c5dd5be9aeac57a
->>>>>>> refs/remotes/origin/master
         
 
         // NOTE: Do not place your application dependencies here; they belong