2131

21312
Merge branch 'master' of https://github.com/Nicklaskaspersen/GitTest

Conflicts:
	src/KanVirke.java