included stephen's changes
changed directory structure
Merge pull request #20 from woolly-bear-caterpillars-2014/john-george

rebased directory for med-flow