Adding of tables now complete
Merge branch 'master' of https://github.com/Fumler/program_proj1

Conflicts:
	src/no/whg/mini/Toolbar.java
	src/no/whg/mini/messages.properties
	src/no/whg/mini/messages_nb_NO.properties