Navigation done
Merge branch 'master' of https://github.com/grahamrobbo/demojam14

Conflicts:
	public/data/surf/locations.json