Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser

app/src/main/java/com/example/admin/sleepbetter/MainMenu.java

@@ -428,7 +428,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
                 break;
         }
 
-        setSpecialAlarmManager(21, 45, "Oups:", "Checking questionnaire");
+        setSpecialAlarmManager(0, 1, "Oups:", "Checking questionnaire");
     }
 
     public static class Broadcast1 extends BroadcastReceiver {