Updated Income and Age parts of algorithm
Merge branch 'master' into isaac

Conflicts:
	src/main/java/denfinder/model/Map.java