add pages for general flow
rerouted nav links in review
fixed merge conflict categories
Merge pull request #6 from brianlam93/flow

Flow