first commit
add shannon
Merge branch 'master' of https://github.com/nasnick/shell_scripts
Merge local