computer 1 is doing something that may meet a conflict
Merge branch 'dev' of https://github.com/steve-jokes/learngit into dev