kbalog/uis-dat310-project — pull request #11 by petterausterheim (2014-11-14 08:50:01+00:00)
Title: Merge pull request #1 from kbalog/master

Merge from master