JUST WORK
Merge branch 'master' of github.com:JenniferShola/Kai

Conflicts:
	.DS_Store