ingen box i template
Merge branch 'master' of github.com:dunz0r/Sakletaren

Conflicts:
	static/out.png
Merge branch 'master' of github.com:dunz0r/Sakletaren