Merge branch 'JK' into development
Merge branch 'JK' into development
Minor changes to horserace.js
added the start of timer functions
Merge branch 'development' into JK