used the git add command, commited locally
Merge branch 'master' of https://github.com/mileslef/hello_world