main page complete
Merge branch 'master' of https://github.com/takeon8/seattle-gps

Conflicts:
	lib/router.js