Merge branch 'altaaj' of https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner into wishnu

# Conflicts: # out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/Student.class # out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/model/Timetable.class # src/Softeng/Group3/SiJadwal/actor/Student.java

Merge branch 'altaaj' of https://gitlab.cs.ui.ac.id/softeng-group-3/weekly-planner into wishnu
9fadb323 · hazlazuardi · 9182f6f9 · 64dd6736 · 9182f6f9 · 9fadb323
Commit 9fadb323 authored 4 years ago by hazlazuardi
--- a/out/production/SiJadwal_Simple/META-INF/SiJadwal_Simple.kotlin_module
+++ b/out/production/SiJadwal_Simple/META-INF/SiJadwal_Simple.kotlin_module
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/Main.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/Main.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/Admin.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/Admin.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/Student.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/Student.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/User$1.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/User$1.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/User.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/actor/User.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/model/Course.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/model/Course.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/model/Timetable.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/model/Timetable.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/CSVOperator.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/CSVOperator.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/CourseList.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/CourseList.class
--- a/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/UserList.class
+++ b/out/production/SiJadwal_Simple/Softeng/Group3/SiJadwal/repository/UserList.class