Merge pull request #1 from michaeltirenin/master

added label
Added log statement
added another conflict
another print statement
testing merge conflictMerge branch 'master' of https://github.com/gaylejj/GroupGithubTesting