Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of https://github.com/West-House-Project/west-house-middle-layer
Merge branch 'master' into development
Merge branch 'development'
Ignored all .DS_Store files.