Amani Yunge
Merge branch 'master' of https://github.com/AmaniYunge/center_one

Conflicts:
	.idea/modules.xml
first pull
first pull
changing background image