# Conflicts:
#	BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java
#	BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/MatchedWishlistRecordService.java

# Conflicts:
#	BackendFolder/SwitchRoom/src/main/resources/application.properties

add reset password feature

See merge request !35

# Conflicts:
#   FrontendFolder/switch-room/src/services/UserService.ts

Start AgreedMatchPage to show the ongoing matches and history matches for user give rating and comments

Sprint 2 done

See merge request !34

Solve the footer float problem

See merge request !33

add flight ticket part

See merge request !32

# Conflicts:
#	BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/MatchedWishlistRecordRepository.java
#	FrontendFolder/switch-room/src/App.vue
#	FrontendFolder/switch-room/src/components/AppHeader.vue
#	FrontendFolder/switch-room/src/components/WishlistPage.vue
#	FrontendFolder/switch-room/src/router/index.ts

Offer page and Wishlist page are able to fetch the matched records and display them as list in the UI. Next I need to show number icon on the wishlist cards

Add readonly and disabled to offer and wishlist pages so user only allowed to change in certain state