No real progress
Merge branch 'master' of https://github.com/Fumler/program_proj1

Conflicts:
	src/no/whg/mini/CustomTableModel.java