bimodal
Merge remote-tracking branch 'origin/master'

Conflicts:
	ADVSTAT/bin/Driver.class
	ADVSTAT/src/Driver.java