Completed result uploads
Merge branch 'master' of github.com:surreymagpie/Athletics

Conflicts:
	app/models/result.rb
Migrated to Postgres in development