fixed gitignore issues
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/Med-Flow
merging changes
added a gitignore
Merge pull request #29 from abcm1989/master

added gitignore