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

Conflicts:
	Phase3/View/view.py
change view&index
Merge remote-tracking branch 'origin/master'