Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses / src / domain / Districs.java
2015-05-18 epinzolas001Merge conflicts solutioned
2015-03-25 camjanVillatripas de arriba districs added and the option...