Modified functions in .bashrc
Merge branch 'master' of github.com:jasonLwwe/conf-files
Changed return values of functions in .bashrc
Merge remote-tracking branch 'origin/looping-sh'
Fixed merge conflict