Fresh history
Brought in HelloGit
Merge branch 'hello'