conflict resolve commit
conflict2
Merge branch 'master' of https://github.com/pjbober/NetConfig