Branch!!
Merge branch 'granskogenBranch' of https://github.com/gruppe28/fp2014 into granskogenBranch