First terminal commit
Merge branch 'master' of https://github.com/fahred/testRepo

test merge