Pushing up whatever extra things git wanted me to push up
Merge branch 'master' of https://github.com/fruktstav/demokratinu