conflicts resolved
Merge pull request #15 from KodeIV/natbranchauth

conflicts resolved