adding mikec
this is my comment
New File Created
Merge branch 'master' of https://github.com/elephantscale/ctl
Merge branch 'master' of https://github.com/elephantscale/ctl
my second change
Merge branch 'master' of https://github.com/elephantscale/ctl
testing the new file changes.
Merge branch 'master' of https://github.com/elephantscale/ctl
Merge branch 'master' of https://github.com/elephantscale/ctl
Merge branch 'master' of https://github.com/elephantscale/ctl
Merge branch 'master' of https://github.com/elephantscale/ctl
Merge branch 'master' of https://github.com/elephantscale/ctl
change
Steve
Merge branch 'master' of https://github.com/elephantscale/ctl
good stuff

Conflicts:
	Ballantyne
Merge branch 'master' of https://github.com/elephantscale/ctl
added new file
new file added.
modified pathell.txt file.