pull form git
Merge branch 'master' of https://github.com/AmaniYunge/center_one

Conflicts:
	.idea/workspace.xml
my commit