Changed import method

Changed to the simpler parse method for the athlete model
Merge branch 'master' of github.com:surreymagpie/Athletics

Conflicts:
	app/controllers/athletes_controller.rb