this is the first commit from the command line
Merge branch 'master' of https://github.com/caljep/temp