User login
Merge branch 'master' of https://github.com/raymondgh/CoRiders

Conflicts:
	index.html