add all the things
lols
done
Merge branch 'nico'

Conflicts:
	index.html
Litt notater