Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / src / domain / Client.java
2015-05-18 epinzolas001Merge conflicts solutioned