wip
Merge branch 'master' of github.com:gustavengstrom/gpsgate

Conflicts:
	style/main.css