Add rides association to competition model
Merge branch 'master' into production