j
Merge branch 'master' of https://github.com/afberg/IdagInatt

Conflicts:
	index.html