update of join ride
Merge branch 'master' of https://github.com/RideTogether/ridetogether.github.io

Conflicts:
	JS/parse.js