added another conflict
testing merge conflictMerge branch 'master' of https://github.com/gaylejj/GroupGithubTesting
Merge pull request #2 from michaeltirenin/master

Final Merge