merging to merge changes
Merge branch 'development' of https://github.com/zpartal/CSCE431_HorseRace_Server into development

Conflicts:
	server.js