asd
Merge branch 'develop' of https://github.com/psyburn/oboji.se into develop

* 'develop' of https://github.com/psyburn/oboji.se:
  fix common.scss merge confilict
  added loading screen
  some stylign