Merge conflicts solutioned
drwxr-xr-x - ruralHouses client
drwxr-xr-x - ruralHouses