NU börjar ju saker funka
Merge remote-tracking branch 'origin/master'

Conflicts:
	2-labbymezzage/messageboard.js