Including packages and rewriting classes
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt.git
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt.git
Including packages and rewriting classes