Edit folder structure
Merge remote-tracking branch 'origin/stephen' into justin_daniel
merging with stephen branhc
Merge remote-tracking branch 'origin/justin_daniel'
Delete .DS_Store

remove
Delete .DS_Store

delete
fiex merge conflict