patching root folder conflict
Merge pull request #3 from harrisonde/flow

patching root folder conflict and host name