massa saker
Merge branch 'master' of github.com:AlexxHansson/pollposition

Conflicts:
	app/index.html
	package.json