vikre/TDT4245 — pull request #4 by vikre (2013-10-01 18:29:18+00:00)
Title: Mari

Merges inn