properties files merge
Merge branch 'master' of
https://github.com/Mpmprogramming/BeerPrediction.git

Conflicts:
	rapidminer/displayResults.properties