only committing the 'blah' file.  Not the 'smoke' file.
Merge branch 'master' of github.com:cposada/test