Second commit test igen
Merge origin/master

Conflicts:
	src/friggcheckud/FRIGGCheckUd.java
Test igen igen og igen
Merge origin/master