test of fork
Merge remote-tracking branch 'origin/Cole'
Merge pull request #7 from bittelc/master

test