Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses / src / common /
drwxr-xr-x   ..
-rw-r--r-- 284 AccountInterface.java
-rw-r--r-- 959 AdminInterface.java
-rw-r--r-- 632 BookingInterface.java
-rw-r--r-- 889 HouseInterface.java
-rw-r--r-- 239 LoginInterface.java
-rw-r--r-- 751 OfferInterface.java
-rw-r--r-- 247 OwnerInterface.java