after resolving conflicts
Merge branch 'master' of https://github.com/rowlandn/bash
merging mac and linux versions
kk
llMerge branch 'master' of https://github.com/rowlandn/bash
all files now changed