Rewrite router class
add comments to gitignore [ci skip]
Merge commit 'a3b84e6f8b0f1f4b96393edad665c4eb5f381fc2'
Rewrite router tests