Three animation
Merge branch 'master' of https://github.com/SermonB/Lindegroen

Conflicts:
	config.codekit
	images/boom.svg
	js/min/storting-min.js
	js/storting.js