Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses client / src / configuration / .DS_Store
2015-05-18 epinzolas001Merge conflicts solutioned