Merge pull request #57 from stcrestrada/master

Estrada Merge
mergeMerge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Med-Flow