change index
change index
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Added button and function to data2 and data