settings.yml
Merge branch 'datamapper' of github.com:maymay25/comforthouse2 into datamapper