changes. meh
Merge branch 'master' of https://github.com/pennja01/NorseSquare