Test1
Merge branch 'master' of https://github.com/karenteeayewhy/awe_k2

Conflicts:
	.DS_Store
	Team 2/.DS_Store