Test test
Tester test tesTester test tesTester test testtt
Merge branch 'master' of https://github.com/espen357moe/Zevs

Conflicts:
	src/GeografiPanel.java