commented out flames
Merge branch 'master' of https://github.com/Skovy/divinare-webpage
sucks to suck
Conflicts:
	js/custom.js
merged crap