Merge pull request #1 from qtang3/work

Work
Update data.cs
2
Merge remote-tracking branch 'origin' into work

Conflicts:
	data.cs