all done
Merge pull request #13 from schrockblock/feature/nipcoe/pairprogram_stuff

all done with pair program