fixed driver
Merge branch 'master' of https://github.com/xeon13/430Assignment6

Conflicts:
	src/Driver.java