update table
Merge branch 'master' of https://github.com/esiqveland/prosjektoppgave

Conflicts:
	rapport/datasets/mac_energy_1core.txt
	rapport/datasets/mac_energy_2core.txt