g
Merge branch 'master' of https://github.com/asabbott/marathontrack

Conflicts:
	js/view.js