some minor changes
Merge branch 'master' of https://github.com/Spide90/TaxOptimization.git

Conflicts:
	src/gui/InputTableModell.java
	src/gui/Mainframe.java