Merge branch 'development' of https://github.com/zpartal/CSCE431_HorseRace_Server into development

Conflicts:
	horserace.js
Resolving conflicts
Resolving conflicts
Merge branch 'development' of https://github.com/zpartal/CSCE431_HorseRace_Server into development