First commit through command line from mmac
LearningGitUpdate
second file addition
this is a new file for Johann to merge
commit
Merge github.com:keighty/hello_world
hw1