gleði
mix
Merge branch 'master' of github.com:Benzi-Junior/GreiningReiknirita2

Conflicts:
	PrufuForritBjarni.java
Skýrsla