Merge conflicts
Merge conflicts
Merge branch 'master' of github.com:ftrimble/KingMe-web

* 'master' of github.com:ftrimble/KingMe-web:
  gpxfiles for testing.
Basic search added to rides