Liten GUI endring
Merge remote-tracking branch 'origin/master' into JansBranch
Merge branch 'JansBranch' of https://github.com/gruppe28/fp2014/ into JansBranch
Merge remote-tracking branch 'origin/master' into JansBranch
Merge remote-tracking branch 'origin/master' into JansBranch
Oppdaterer branchen så jeg kan fortsette på master
Merge remote-tracking branch 'origin/master' into JansBranch