Added PreferenceGenerator and PreferenceTester
Added PreferenceGenerator, PreferenceTester and MarketSimulation
classes.
Added PreferenceGenerator, PreferenceTester, MarketSimulation classes
Merge branch 'master' of https://github.com/AvantiShri/GSsimulator

Conflicts:
	bin/gayleshapely/Initializer.class
	bin/gayleshapely/MatchingSoln.class
	bin/gayleshapely/MatchingSolnMonteCarlo$SchoolCounts.class
	bin/gayleshapely/MatchingSolnMonteCarlo.class