merging files
Merge https://github.com/jami3/sigmaSharks