jees
Merge branch 'master' of https://github.com/hawkon/www-prosjekt

Conflicts:
	web/pub.js