Adding the new flow
Merge branch 'master' of github.com:3tokens/truffleserver