Population hashtable
Sample hashtables
Resolving merge issues.
Merge branch 'master' of https://github.com:443/jepjephooray/ADVSTAT.git

Conflicts:
	ADVSTAT/bin/Driver.class
	ADVSTAT/bin/controller/Controller$generateListener.class
	ADVSTAT/bin/controller/Controller.class
	ADVSTAT/bin/model/Model.class
	ADVSTAT/bin/model/Population.class
	ADVSTAT/bin/model/Sample.class
	ADVSTAT/bin/view/View$1.class
	ADVSTAT/bin/view/View.class
	ADVSTAT/src/Driver.java