apparently messed more up
Merge branch 'master' of https://github.com/Skovy/divinare-webpage