i guess ready for master
Merge branch 'feature_manifest' of github.com:Doula/Doula into feature_manifest