snobjorns/fys3220 — pull request #2 by snobjorns (2012-09-12 13:25:04+00:00)
Title: Snorretest

merge snorretest og MASTER