committing final changes
Merge branch 'GAthree' of https://github.com/abacon45/MarioAI.git into
GAthree

Conflicts:
	marioai/src/GeneticAlgorithm/GAthree.java
	marioai/src/ch/idsia/scenarios/Custom.java