Utropstecken
Litet w
Merge branch 'work'

Conflicts:
	app.js
Merge remote-tracking branch 'origin/master'