wasd
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git

Conflicts:
	RRPSS/src/RRPSS/Main.java
	RRPSS/src/RRPSS/ReservationManager.java
Also remove useless method after refactoring