i skolan men kan bli fel
Merge branch 'master' of https://github.com/malmskold/2x-Twobeards

Conflicts:
	index.html