add conflict
Merge branch 'master' of https://github.com/kibtaf/myfirstgit

we're using what was I thinking
update of shell file
update