Merge branch 'View-team' of https://github.com/qinxutan/tp into View-…

…team

* 'View-team' of https://github.com/qinxutan/tp:

# Conflicts:
#	src/test/java/seedu/address/logic/commands/AddStudentCommandTest.java

src/test/java/seedu/address/logic/commands/AddStudentCommandTest.java

@@ -219,8 +219,6 @@ public ObservableList<Person> getFilteredPersonList() {
         public ObservableList<ModuleCode> getFilteredModuleList() {
             throw new AssertionError("This method should not be called.");
         }
-
-        @Override
         public ObservableList<Person> getSortedPersonList(Comparator<Person> comparator) {
             throw new AssertionError("This method should not be called.");
         }